diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-06-07 13:51:44 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-06-07 13:51:44 -0400 |
| commit | 12f351d71b13feb4b808b15f6756fbf6a81de587 (patch) | |
| tree | 8cd3ea02fb98cae19a6288b02abc508b728c8fc0 /roles/openshift_master/tasks | |
| parent | 377405b67551ef51ce6f644bde018986465a1e0c (diff) | |
| parent | c45c5935df97bb4aa9e8e9067d868371b04a24bf (diff) | |
| download | openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.gz openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.bz2 openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.xz openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.zip | |
Merge branch 'docker1.10' of https://github.com/dgoodwin/openshift-ansible
Diffstat (limited to 'roles/openshift_master/tasks')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 52ea8bccf..f12371c23 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -29,7 +29,7 @@ - name: Pull master image command: > - docker pull {{ openshift.master.master_image }}:{{ openshift_version }} + docker pull {{ openshift.master.master_image }}{{ ':' + openshift_version if openshift_version is defined and openshift_version != '' else '' }} when: openshift.common.is_containerized | bool - name: Create openshift.common.data_dir @@ -172,14 +172,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 }}" |