summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-06-17 14:04:44 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-06-17 14:04:44 -0400
commita7ac3f7b513fe57ddccad15bdb6c7e9091f16bcd (patch)
tree065562cf45a0fb03a6cd66844ee655188325685d /roles/openshift_node/tasks
parente903a6b5be49728e31756e5114f7c6ed2553747a (diff)
parent7b316631a2b988318b47d3a50a7b66e3ff3fdbd2 (diff)
downloadopenshift-a7ac3f7b513fe57ddccad15bdb6c7e9091f16bcd.tar.gz
openshift-a7ac3f7b513fe57ddccad15bdb6c7e9091f16bcd.tar.bz2
openshift-a7ac3f7b513fe57ddccad15bdb6c7e9091f16bcd.tar.xz
openshift-a7ac3f7b513fe57ddccad15bdb6c7e9091f16bcd.zip
Merge pull request #285 from sdodson/rc-merge
RC2 Merge
Diffstat (limited to 'roles/openshift_node/tasks')
-rw-r--r--roles/openshift_node/tasks/main.yml28
1 files changed, 14 insertions, 14 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 15d18f510..770b55351 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -1,6 +1,20 @@
---
# TODO: allow for overriding default ports where possible
+- name: Install OpenShift Node package
+ yum: pkg=openshift-node state=present
+ register: node_install_result
+
+- name: Install openshift-sdn-ovs
+ yum: pkg=openshift-sdn-ovs state=present
+ register: sdn_install_result
+ when: openshift.common.use_openshift_sdn
+
+- name: Reload systemd units
+ command: systemctl daemon-reload
+ when: (node_install_result | changed or (openshift.common.use_openshift_sdn
+ and sdn_install_result | changed))
+
- name: Set node OpenShift facts
openshift_facts:
role: "{{ item.role }}"
@@ -22,20 +36,6 @@
debug_level: "{{ openshift_node_debug_level | default(openshift.common.debug_level) }}"
portal_net: "{{ openshift_master_portal_net | default(None) }}"
-- name: Install OpenShift Node package
- yum: pkg=openshift-node state=present
- register: node_install_result
-
-- name: Install openshift-sdn-ovs
- yum: pkg=openshift-sdn-ovs state=present
- register: sdn_install_result
- when: openshift.common.use_openshift_sdn
-
-- name: Reload systemd units
- command: systemctl daemon-reload
- when: (node_install_result | changed or (openshift.common.use_openshift_sdn
- and sdn_install_result | changed))
-
# TODO: add the validate parameter when there is a validation command to run
- name: Create the Node config
template: