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/contiv/tasks/netmaster.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/contiv/tasks/netmaster.yml')
| -rw-r--r-- | roles/contiv/tasks/netmaster.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/contiv/tasks/netmaster.yml b/roles/contiv/tasks/netmaster.yml index cc52d3a43..6f15af8c2 100644 --- a/roles/contiv/tasks/netmaster.yml +++ b/roles/contiv/tasks/netmaster.yml @@ -1,8 +1,8 @@ --- -- include: netmaster_firewalld.yml +- include_tasks: netmaster_firewalld.yml when: has_firewalld -- include: netmaster_iptables.yml +- include_tasks: netmaster_iptables.yml when: not has_firewalld and has_iptables - name: Netmaster | Check is /etc/hosts file exists @@ -70,8 +70,8 @@ state: started register: netmaster_started -- include: aci.yml +- include_tasks: aci.yml when: contiv_fabric_mode == "aci" -- include: default_network.yml +- include_tasks: default_network.yml when: contiv_default_network == true |