summaryrefslogtreecommitdiffstats
path: root/roles/openshift_sdn_master/tasks/main.yml
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2015-04-07 09:32:46 -0700
committerJhon Honce <jhonce@redhat.com>2015-04-07 09:32:46 -0700
commit675f6165a83b86c1a498c327161f928d218ee244 (patch)
tree0ad271a03feac6bde2a296e6011498cd6455fa99 /roles/openshift_sdn_master/tasks/main.yml
parent59e69dd21c19bf745392b5e83bd652630ee870cc (diff)
parent8a4888ad30ce7c5898caac47614da2e13a759320 (diff)
downloadopenshift-675f6165a83b86c1a498c327161f928d218ee244.tar.gz
openshift-675f6165a83b86c1a498c327161f928d218ee244.tar.bz2
openshift-675f6165a83b86c1a498c327161f928d218ee244.tar.xz
openshift-675f6165a83b86c1a498c327161f928d218ee244.zip
Merge pull request #121 from detiber/nodeRegistrationChangesMaster
Node registration changes master
Diffstat (limited to 'roles/openshift_sdn_master/tasks/main.yml')
-rw-r--r--roles/openshift_sdn_master/tasks/main.yml18
1 files changed, 10 insertions, 8 deletions
diff --git a/roles/openshift_sdn_master/tasks/main.yml b/roles/openshift_sdn_master/tasks/main.yml
index e1761afdc..f2d61043b 100644
--- a/roles/openshift_sdn_master/tasks/main.yml
+++ b/roles/openshift_sdn_master/tasks/main.yml
@@ -1,4 +1,13 @@
---
+# TODO: add task to set the sdn subnet if openshift-sdn-master hasn't been
+# started yet
+
+- name: Set master sdn OpenShift facts
+ openshift_facts:
+ role: 'master_sdn'
+ local_facts:
+ debug_level: "{{ openshift_master_sdn_debug_level | default(openshift.common.debug_level) }}"
+
- name: Install openshift-sdn-master
yum:
pkg: openshift-sdn-master
@@ -8,17 +17,10 @@
lineinfile:
dest: /etc/sysconfig/openshift-sdn-master
regexp: '^OPTIONS='
- line: "OPTIONS=\"-v={{ openshift_sdn_master_debug_level }}\""
+ line: "OPTIONS=\"-v={{ openshift.master_sdn.debug_level }}\""
notify:
- restart openshift-sdn-master
-- name: Set openshift-sdn-master facts
- include: "{{ role_path | dirname }}/openshift_common/tasks/set_facts.yml"
- facts:
- - section: sdn-master
- option: debug_level
- value: "{{ openshift_sdn_master_debug_level }}"
-
- name: Enable openshift-sdn-master
service:
name: openshift-sdn-master