summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-07-11 15:45:22 -0400
committerGitHub <noreply@github.com>2017-07-11 15:45:22 -0400
commit0d0c6d15d5d413ebefe31370a5c9ad5f0d7bada0 (patch)
tree628036606c28d3926e17f6e6afcbbde2b38ab237 /playbooks/common
parentac94a653f1f971aa84916224a831457dad86b0f6 (diff)
parente90f176b25882e27b928cf5ae53a1f33cdeb2373 (diff)
downloadopenshift-0d0c6d15d5d413ebefe31370a5c9ad5f0d7bada0.tar.gz
openshift-0d0c6d15d5d413ebefe31370a5c9ad5f0d7bada0.tar.bz2
openshift-0d0c6d15d5d413ebefe31370a5c9ad5f0d7bada0.tar.xz
openshift-0d0c6d15d5d413ebefe31370a5c9ad5f0d7bada0.zip
Merge pull request #4709 from jkaurredhat/upgrade-control_plane
Merged by openshift-bot
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index 227fbf60a..86f2cfa54 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -223,7 +223,7 @@
- name: Reconcile Security Context Constraints
command: >
- {{ openshift.common.client_binary }} adm policy reconcile-sccs --confirm --additive-only=true -o name
+ {{ openshift.common.client_binary }} adm policy --config={{ openshift.common.config_base }}/master/admin.kubeconfig reconcile-sccs --confirm --additive-only=true -o name
register: reconcile_scc_result
changed_when:
- reconcile_scc_result.stdout != ''