summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-08-30 23:15:51 -0400
committerGitHub <noreply@github.com>2017-08-30 23:15:51 -0400
commitd57f27bf71f68ba91996bc4a0b1e79b3be956b7e (patch)
tree1a0c82fbf9a94fa1a931644eb3276eb9d8903cd4 /playbooks/common
parent3efcda7698d053c16c247e557005d694db58da9e (diff)
parent1a0241e889e94567b5d33d89d3210876f0c34c88 (diff)
downloadopenshift-d57f27bf71f68ba91996bc4a0b1e79b3be956b7e.tar.gz
openshift-d57f27bf71f68ba91996bc4a0b1e79b3be956b7e.tar.bz2
openshift-d57f27bf71f68ba91996bc4a0b1e79b3be956b7e.tar.xz
openshift-d57f27bf71f68ba91996bc4a0b1e79b3be956b7e.zip
Merge pull request #5247 from mgugino-upstream-stage/fix-master-upgrades
Merged by openshift-bot
Diffstat (limited to 'playbooks/common')
-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 5059ecc43..18f10437d 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