summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-21 16:50:53 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-21 16:50:53 -0500
commit6f1a7e75e89796a4a0378ceae419eb9e7ffb1fe5 (patch)
treee4c2d346179b14784e015efa23f4ea97f77393cc /playbooks
parentfbf32e8e992a5de1cb5fa9cacba9224658b5c0a4 (diff)
downloadopenshift-6f1a7e75e89796a4a0378ceae419eb9e7ffb1fe5.tar.gz
openshift-6f1a7e75e89796a4a0378ceae419eb9e7ffb1fe5.tar.bz2
openshift-6f1a7e75e89796a4a0378ceae419eb9e7ffb1fe5.tar.xz
openshift-6f1a7e75e89796a4a0378ceae419eb9e7ffb1fe5.zip
Remove bootstrap.yml from main.yml in openshift_node role
This commit utilizes include_role for bootstrapping the node instead of conditional include of tasks now that the node role has no meta includes that have tasks.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/openshift-node/private/image_prep.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/playbooks/openshift-node/private/image_prep.yml b/playbooks/openshift-node/private/image_prep.yml
index 6b517197d..c0ddcd926 100644
--- a/playbooks/openshift-node/private/image_prep.yml
+++ b/playbooks/openshift-node/private/image_prep.yml
@@ -12,6 +12,13 @@
- name: run node config
import_playbook: configure_nodes.yml
+- name: node bootstrap config
+ hosts: oo_nodes_to_config:!oo_containerized_master_nodes
+ tasks:
+ - include_role:
+ name: openshift_node
+ tasks_from: bootstrap.yml
+
- name: Re-enable excluders
import_playbook: enable_excluders.yml