summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-06-09 08:25:56 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-06-09 08:25:56 -0400
commite272847e1a195d8ca74103fd87c7207b68c0d919 (patch)
treecdccad5d89148752bc5acafcbfe80e390366069c /roles
parent4bec37c10f835902a42b62493c5df0de97db73f8 (diff)
parentdcff138a3230a0f23cb627901b2a28cc6bec2e6b (diff)
downloadopenshift-e272847e1a195d8ca74103fd87c7207b68c0d919.tar.gz
openshift-e272847e1a195d8ca74103fd87c7207b68c0d919.tar.bz2
openshift-e272847e1a195d8ca74103fd87c7207b68c0d919.tar.xz
openshift-e272847e1a195d8ca74103fd87c7207b68c0d919.zip
Merge pull request #1 from dgoodwin/docker1.10
Restore mistakenly reverted code.
Diffstat (limited to 'roles')
-rw-r--r--roles/etcd/tasks/main.yml12
-rw-r--r--roles/openshift_master/tasks/main.yml9
2 files changed, 13 insertions, 8 deletions
diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml
index a798dc973..71735dc25 100644
--- a/roles/etcd/tasks/main.yml
+++ b/roles/etcd/tasks/main.yml
@@ -28,18 +28,18 @@
state: directory
mode: 0700
+- name: Check for etcd service presence
+ command: systemctl show etcd.service
+ register: etcd_show
+ changed_when: false
+
- name: Disable system etcd when containerized
- when: etcd_is_containerized | bool
+ when: etcd_is_containerized | bool and 'LoadState=not-found' not in etcd_show.stdout
service:
name: etcd
state: stopped
enabled: no
-- name: Check for etcd service presence
- command: systemctl show etcd.service
- register: etcd_show
- changed_when: false
-
- name: Mask system etcd when containerized
when: etcd_is_containerized | bool and 'LoadState=not-found' not in etcd_show.stdout
command: systemctl mask etcd
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index f12371c23..28faee155 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -172,9 +172,14 @@
register: start_result
notify: Verify API Server
-- name: Stop and disable non HA master when running HA
+- 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
service: name={{ openshift.common.service_type }}-master enabled=no state=stopped
- when: openshift_master_ha | bool
+ when: openshift_master_ha | bool and 'LoadState=not-found' not in master_svc_show.stdout
- set_fact:
master_service_status_changed: "{{ start_result | changed }}"