summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-02 07:56:04 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-02 07:56:04 -0500
commitc11293dc167cbafdfff2c5d01239de53a77b053b (patch)
tree61db843eafd696e1ea1a75b5f516a21dfeeefc0c
parente836cad9b4703e62ffbe6867d00b4a346529b145 (diff)
parent9abdd8b57ba09caeae8e9cdd5710b3363b809e3f (diff)
downloadopenshift-c11293dc167cbafdfff2c5d01239de53a77b053b.tar.gz
openshift-c11293dc167cbafdfff2c5d01239de53a77b053b.tar.bz2
openshift-c11293dc167cbafdfff2c5d01239de53a77b053b.tar.xz
openshift-c11293dc167cbafdfff2c5d01239de53a77b053b.zip
Merge pull request #86 from detiber/manageExternal
Disable master,node services when externally managed
-rw-r--r--roles/openshift_master/tasks/main.yml4
-rw-r--r--roles/openshift_node/tasks/main.yml4
2 files changed, 8 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index ea97e42cc..45f776859 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -31,3 +31,7 @@
- name: Start and enable openshift-master
service: name=openshift-master enabled=yes state=started
when: not openshift_master_manage_service_externally
+
+- name: Disable openshift-master if openshift-master is managed externally
+ service: name=openshift-master enabled=false
+ when: openshift_master_manage_service_externally
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index ca357c782..72dc23dea 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -40,3 +40,7 @@
- name: Start and enable openshift-node
service: name=openshift-node enabled=yes state=restarted
when: not openshift_node_manage_service_externally
+
+- name: Disable openshift-node if openshift-node is managed externally
+ service: name=openshift-node enabled=false
+ when: openshift_node_manage_service_externally