diff options
author | Russell Teague <rteague@redhat.com> | 2017-11-22 16:34:59 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-22 16:34:59 -0500 |
commit | 9a405010c5a656f89866906d29866ba98493e91b (patch) | |
tree | b9bcd798419a79a5517d9b1f6909f88f98179e7c /roles/openshift_node/tasks/main.yml | |
parent | dbaf0dcd3c0b68da7e38ee098d9e6f8a4ed9e532 (diff) | |
parent | bf19d26f2be591b9cb4e3379c015bfe5f31b4f0a (diff) | |
download | openshift-9a405010c5a656f89866906d29866ba98493e91b.tar.gz openshift-9a405010c5a656f89866906d29866ba98493e91b.tar.bz2 openshift-9a405010c5a656f89866906d29866ba98493e91b.tar.xz openshift-9a405010c5a656f89866906d29866ba98493e91b.zip |
Merge pull request #6234 from mtnbikenc/include-deprecation-openshift-node
Include Deprecation - openshift-node
Diffstat (limited to 'roles/openshift_node/tasks/main.yml')
-rw-r--r-- | roles/openshift_node/tasks/main.yml | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index eae9ca7bc..8e9d1d1b5 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -7,8 +7,7 @@ - not openshift_use_crio | default(false) - name: setup firewall - include: firewall.yml - static: yes + import_tasks: firewall.yml #### Disable SWAP ##### # https://docs.openshift.com/container-platform/3.4/admin_guide/overcommit.html#disabling-swap-memory @@ -41,7 +40,7 @@ #### End Disable Swap Block #### - name: include node installer - include: install.yml + include_tasks: install.yml - name: Restart cri-o systemd: @@ -66,34 +65,34 @@ sysctl_file: "/etc/sysctl.d/99-openshift.conf" reload: yes -- include: registry_auth.yml +- include_tasks: registry_auth.yml - name: include standard node config - include: config.yml + include_tasks: config.yml #### Storage class plugins here #### - name: NFS storage plugin configuration - include: storage_plugins/nfs.yml + include_tasks: storage_plugins/nfs.yml tags: - nfs - name: GlusterFS storage plugin configuration - include: storage_plugins/glusterfs.yml + include_tasks: storage_plugins/glusterfs.yml when: "'glusterfs' in openshift.node.storage_plugin_deps" - name: Ceph storage plugin configuration - include: storage_plugins/ceph.yml + include_tasks: storage_plugins/ceph.yml when: "'ceph' in openshift.node.storage_plugin_deps" - name: iSCSI storage plugin configuration - include: storage_plugins/iscsi.yml + include_tasks: storage_plugins/iscsi.yml when: "'iscsi' in openshift.node.storage_plugin_deps" ##### END Storage ##### -- include: config/workaround-bz1331590-ovs-oom-fix.yml +- include_tasks: config/workaround-bz1331590-ovs-oom-fix.yml when: openshift_node_use_openshift_sdn | default(true) | bool - name: include bootstrap node config - include: bootstrap.yml + include_tasks: bootstrap.yml when: openshift_node_bootstrap |