diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-18 07:48:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 07:48:17 -0400 |
| commit | 63b77fbe00e4c724452a0256c6fdafc165755962 (patch) | |
| tree | 6b2b32616fe25f91d0658ea4ef73b79b1b3ab526 /roles/openshift_node/tasks/main.yml | |
| parent | 5ff1e1bec64ea99830003a7f7d44de0ac1e65a57 (diff) | |
| parent | 47d2e205fa6c76ec66cd22b9100b561cd71e6976 (diff) | |
| download | openshift-63b77fbe00e4c724452a0256c6fdafc165755962.tar.gz openshift-63b77fbe00e4c724452a0256c6fdafc165755962.tar.bz2 openshift-63b77fbe00e4c724452a0256c6fdafc165755962.tar.xz openshift-63b77fbe00e4c724452a0256c6fdafc165755962.zip | |
Merge pull request #5361 from kwoodson/fix_bootstrap_files
Provisioning updates.
Diffstat (limited to 'roles/openshift_node/tasks/main.yml')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 59b8bb76e..eae9ca7bc 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -66,15 +66,10 @@ sysctl_file: "/etc/sysctl.d/99-openshift.conf" reload: yes -- name: include bootstrap node config - include: bootstrap.yml - when: openshift_node_bootstrap - - include: registry_auth.yml - name: include standard node config include: config.yml - when: not openshift_node_bootstrap #### Storage class plugins here #### - name: NFS storage plugin configuration @@ -98,3 +93,7 @@ - include: config/workaround-bz1331590-ovs-oom-fix.yml when: openshift_node_use_openshift_sdn | default(true) | bool + +- name: include bootstrap node config + include: bootstrap.yml + when: openshift_node_bootstrap |