summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-02 10:49:58 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-02 10:49:58 -0500
commit17feda9c8694da54e63294aa926209cf33b54101 (patch)
treeb1eff8e568e4875c67e9205b0eddd4a74bc78538
parentc11293dc167cbafdfff2c5d01239de53a77b053b (diff)
parent02478965aa7b15f5d8e696b221f3d0dbd3eb81a4 (diff)
downloadopenshift-17feda9c8694da54e63294aa926209cf33b54101.tar.gz
openshift-17feda9c8694da54e63294aa926209cf33b54101.tar.bz2
openshift-17feda9c8694da54e63294aa926209cf33b54101.tar.xz
openshift-17feda9c8694da54e63294aa926209cf33b54101.zip
Merge pull request #85 from detiber/moveLocalFacts
Set local_facts for openshift_{node,master} later in the task list
-rw-r--r--roles/openshift_master/tasks/main.yml14
-rw-r--r--roles/openshift_node/tasks/main.yml12
2 files changed, 14 insertions, 12 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 45f776859..07483c0d6 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -2,13 +2,6 @@
- name: Install OpenShift Master package
yum: pkg=openshift-master state=installed
-- name: Set master OpenShift facts
- include: "{{ role_path | dirname }}/openshift_common/tasks/set_facts.yml"
- facts:
- - { section: master, option: debug_level, value: "{{ openshift_master_debug_level }}" }
- - { section: master, option: public_ip, value: "{{ openshift_public_ip }}" }
- - { section: master, option: externally_managed, value: "{{ openshift_master_manage_service_externally }}" }
-
- name: Configure firewall for OpenShift Master
include: "{{ role_path | dirname }}/openshift_common/tasks/firewall.yml"
allow:
@@ -28,6 +21,13 @@
notify:
- restart openshift-master
+- name: Set master OpenShift facts
+ include: "{{ role_path | dirname }}/openshift_common/tasks/set_facts.yml"
+ facts:
+ - { section: master, option: debug_level, value: "{{ openshift_master_debug_level }}" }
+ - { section: master, option: public_ip, value: "{{ openshift_public_ip }}" }
+ - { section: master, option: externally_managed, value: "{{ openshift_master_manage_service_externally }}" }
+
- name: Start and enable openshift-master
service: name=openshift-master enabled=yes state=started
when: not openshift_master_manage_service_externally
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 72dc23dea..9015cae80 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -2,11 +2,6 @@
- name: Install OpenShift Node package
yum: pkg=openshift-node state=installed
-- name: Set OpenShift node facts
- include: "{{ role_path | dirname }}/openshift_common/tasks/set_facts.yml"
- facts:
- - { section: node, option: debug_level, value: "{{ openshift_node_debug_level }}" }
-
- local_action: command /usr/bin/mktemp -d /tmp/openshift-ansible-XXXXXXX
register: mktemp
@@ -35,6 +30,13 @@
notify:
- restart openshift-node
+- name: Set OpenShift node facts
+ include: "{{ role_path | dirname }}/openshift_common/tasks/set_facts.yml"
+ facts:
+ - { section: node, option: debug_level, value: "{{ openshift_node_debug_level }}" }
+ - { section: node, option: public_ip, value: "{{ openshift_public_ip }}" }
+ - { section: node, option: externally_managed, value: "{{ openshift_node_manage_service_externally }}" }
+
# fixme: Once the openshift_cluster playbook is published state should be started
# Always bounce service to pick up new credentials
- name: Start and enable openshift-node