diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-30 23:15:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 23:15:51 -0400 |
| commit | d57f27bf71f68ba91996bc4a0b1e79b3be956b7e (patch) | |
| tree | 1a0c82fbf9a94fa1a931644eb3276eb9d8903cd4 | |
| parent | 3efcda7698d053c16c247e557005d694db58da9e (diff) | |
| parent | 1a0241e889e94567b5d33d89d3210876f0c34c88 (diff) | |
| download | openshift-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
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/systemd_units.yml | 10 |
3 files changed, 11 insertions, 7 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 diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index ba56ac94e..a06defdb9 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -177,9 +177,6 @@ local_facts: no_proxy_etcd_host_ips: "{{ openshift_no_proxy_etcd_host_ips }}" -- name: Remove the legacy master service if it exists - include: clean_systemd_units.yml - - name: Install the systemd units include: systemd_units.yml diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml index 72c231e52..782a35abe 100644 --- a/roles/openshift_master/tasks/systemd_units.yml +++ b/roles/openshift_master/tasks/systemd_units.yml @@ -3,6 +3,16 @@ # playbooks. For that reason the ha_svc variables are use set_fact instead of # the vars directory on the role. +# This play may be consumed outside the role, we need to ensure that +# openshift_master_config_dir is set. +- name: Set openshift_master_config_dir if unset + set_fact: + openshift_master_config_dir: '/var/lib/origin' + when: openshift_master_config_dir is not defined + +- name: Remove the legacy master service if it exists + include: clean_systemd_units.yml + - name: Init HA Service Info set_fact: containerized_svc_dir: "/usr/lib/systemd/system" |