summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/tasks
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-01 15:34:18 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-03 16:04:43 -0300
commit0c31d72be3bf32f848eedad9859a81ba858f8c8f (patch)
tree1c67d477c8888a4d2f0cc69bd0a5cb6a69a818a0 /roles/openshift_master/tasks
parent31acd9c9abcc31326fe56910f1c58fd9c7673ecd (diff)
downloadopenshift-0c31d72be3bf32f848eedad9859a81ba858f8c8f.tar.gz
openshift-0c31d72be3bf32f848eedad9859a81ba858f8c8f.tar.bz2
openshift-0c31d72be3bf32f848eedad9859a81ba858f8c8f.tar.xz
openshift-0c31d72be3bf32f848eedad9859a81ba858f8c8f.zip
Docker 1.10 Upgrade
Adds a separate playbook for Docker 1.10 upgrade that can be run standalone on a pre-existing 3.2 cluster. The upgrade will take each node out of rotation, and remove *all* containers and images on it, as this is reportedly faster and more storage efficient than performing the in place 1.10 upgrade. This process is integrated into the 3.1 to 3.2 upgrade process. Normal config playbooks now become 3.2 only, and require Docker 1.10. Users of older environments will have to use an appropriate openshift-ansible version. Config playbooks no longer are in the business of upgrading or downgrading docker.
Diffstat (limited to 'roles/openshift_master/tasks')
-rw-r--r--roles/openshift_master/tasks/main.yml9
1 files changed, 2 insertions, 7 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index f70eaf144..63a54a0d9 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -164,14 +164,9 @@
register: start_result
notify: Verify API Server
-- name: Check for non-HA master service presence
- command: systemctl show {{ openshift.common.service_type }}-master.service
- register: master_svc_show
- changed_when: false
-
-- name: Stop and disable non-HA master when running HA
+- name: Stop and disable non HA master when running HA
service: name={{ openshift.common.service_type }}-master enabled=no state=stopped
- when: openshift_master_ha | bool and 'LoadState=not-found' not in master_svc_show.stdout
+ when: openshift_master_ha | bool
- set_fact:
master_service_status_changed: "{{ start_result | changed }}"