summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-08-28 19:33:01 -0400
committerMichael Gugino <mgugino@redhat.com>2017-08-29 13:38:47 -0400
commit1a0241e889e94567b5d33d89d3210876f0c34c88 (patch)
tree6e4c179bfd8ab0ea2756727507031502241f03e3 /playbooks/common/openshift-cluster
parent60d544846d049b85539e7b2ea91a7aee00eb15a0 (diff)
downloadopenshift-1a0241e889e94567b5d33d89d3210876f0c34c88.tar.gz
openshift-1a0241e889e94567b5d33d89d3210876f0c34c88.tar.bz2
openshift-1a0241e889e94567b5d33d89d3210876f0c34c88.tar.xz
openshift-1a0241e889e94567b5d33d89d3210876f0c34c88.zip
Fix openshift_master upgrade
Currently, openshift_master upgrade play imports tasks directly from the openshift_master role. This method does not honor role defaults. This commit changes sets openshift_master_config_dir if undefined.
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml5
1 files changed, 1 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index abcd21c90..fbb355703 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -91,10 +91,7 @@
- include_vars: ../../../../roles/openshift_master/vars/main.yml
- - name: Remove any legacy systemd units
- include: ../../../../roles/openshift_master/tasks/clean_systemd_units.yml
-
- - name: Update systemd units
+ - name: Remove any legacy systemd units and update systemd units
include: ../../../../roles/openshift_master/tasks/systemd_units.yml
- name: Check for ca-bundle.crt