summaryrefslogtreecommitdiffstats
path: root/playbooks/openshift-node/private
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2018-01-02 12:50:49 -0500
committerGitHub <noreply@github.com>2018-01-02 12:50:49 -0500
commiteb43e2b79ed34dca04bff5522190ff7735814a7a (patch)
treefa56fbc5aa7769834a04ade18befecbcb1f1802d /playbooks/openshift-node/private
parent332764e4541d8c922f2589a533bb56b2a2419ac1 (diff)
parent6f1a7e75e89796a4a0378ceae419eb9e7ffb1fe5 (diff)
downloadopenshift-eb43e2b79ed34dca04bff5522190ff7735814a7a.tar.gz
openshift-eb43e2b79ed34dca04bff5522190ff7735814a7a.tar.bz2
openshift-eb43e2b79ed34dca04bff5522190ff7735814a7a.tar.xz
openshift-eb43e2b79ed34dca04bff5522190ff7735814a7a.zip
Merge pull request #6554 from mgugino-upstream-stage/bootstrap-to-include-role
Remove bootstrap.yml from main.yml in openshift_node role
Diffstat (limited to 'playbooks/openshift-node/private')
-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