summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-09 13:02:55 -0800
committerGitHub <noreply@github.com>2018-02-09 13:02:55 -0800
commit401832979e466d8e1094d56f1e08c3f842393ee7 (patch)
tree1acac6ffc502691932004ea3f908dd31a5dea1d2 /playbooks/common
parent1a9a61bc56d9c51068143dbbde7963535a07c043 (diff)
parent859b1cb4272ac81685d25b0d5772f9e53cf90eea (diff)
downloadopenshift-401832979e466d8e1094d56f1e08c3f842393ee7.tar.gz
openshift-401832979e466d8e1094d56f1e08c3f842393ee7.tar.bz2
openshift-401832979e466d8e1094d56f1e08c3f842393ee7.tar.xz
openshift-401832979e466d8e1094d56f1e08c3f842393ee7.zip
Merge pull request #7088 from mgugino-upstream-stage/fix-upgrade-cp
Automatic merge from submit-queue. Fix upgrade-control plane post_control_plane.yml An entry-point playbook was imported by mistake. This caused common init code to run again, which is undesireable. This commit changes the import to use the corresponding 'private' play which does not call the init code. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542855
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/post_control_plane.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
index fafbd8d1c..86cde2844 100644
--- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
@@ -134,7 +134,7 @@
# Run the redeploy certs based upon the certificates. Defaults to False for insecure registries
- when: (hostvars[groups.oo_first_master.0].openshift_hosted_rollout_certs_and_registry | default(False)) | bool
- import_playbook: ../../../openshift-hosted/redeploy-registry-certificates.yml
+ import_playbook: ../../../openshift-hosted/private/redeploy-registry-certificates.yml
# Check for warnings to be printed at the end of the upgrade:
- name: Clean up and display warnings