diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2018-01-02 12:50:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 12:50:49 -0500 |
| commit | eb43e2b79ed34dca04bff5522190ff7735814a7a (patch) | |
| tree | fa56fbc5aa7769834a04ade18befecbcb1f1802d | |
| parent | 332764e4541d8c922f2589a533bb56b2a2419ac1 (diff) | |
| parent | 6f1a7e75e89796a4a0378ceae419eb9e7ffb1fe5 (diff) | |
| download | openshift-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
| -rw-r--r-- | playbooks/openshift-node/private/image_prep.yml | 7 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 4 |
2 files changed, 7 insertions, 4 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 diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index eb362816a..103572291 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -99,7 +99,3 @@ - include_tasks: config/workaround-bz1331590-ovs-oom-fix.yml when: openshift_node_use_openshift_sdn | default(true) | bool - -- name: include bootstrap node config - include_tasks: bootstrap.yml - when: openshift_node_bootstrap |