Browse Source

Set local_facts for openshift_node and openshift_master later in the task list

Jason DeTiberus 10 years ago
parent
commit
02478965aa
2 changed files with 14 additions and 12 deletions
  1. 7 7
      roles/openshift_master/tasks/main.yml
  2. 7 5
      roles/openshift_node/tasks/main.yml

+ 7 - 7
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

+ 7 - 5
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