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 | |
| 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')
| -rw-r--r-- | roles/contiv/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/contiv/tasks/netmaster.yml | 8 | ||||
| -rw-r--r-- | roles/contiv/tasks/netplugin.yml | 6 | ||||
| -rw-r--r-- | roles/contiv/tasks/ovs.yml | 2 | ||||
| -rw-r--r-- | roles/contiv/tasks/packageManagerInstall.yml | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/roles/contiv/tasks/main.yml b/roles/contiv/tasks/main.yml index 40a0f9e61..cb9196a71 100644 --- a/roles/contiv/tasks/main.yml +++ b/roles/contiv/tasks/main.yml @@ -5,10 +5,10 @@ recurse: yes state: directory -- include: download_bins.yml +- include_tasks: download_bins.yml -- include: netmaster.yml +- include_tasks: netmaster.yml when: contiv_role == "netmaster" -- include: netplugin.yml +- include_tasks: netplugin.yml when: contiv_role == "netplugin" 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 diff --git a/roles/contiv/tasks/netplugin.yml b/roles/contiv/tasks/netplugin.yml index e861a2591..0b2f91bab 100644 --- a/roles/contiv/tasks/netplugin.yml +++ b/roles/contiv/tasks/netplugin.yml @@ -1,8 +1,8 @@ --- -- include: netplugin_firewalld.yml +- include_tasks: netplugin_firewalld.yml when: has_firewalld -- include: netplugin_iptables.yml +- include_tasks: netplugin_iptables.yml when: has_iptables - name: Netplugin | Ensure localhost entry correct in /etc/hosts @@ -19,7 +19,7 @@ line: '::1 ' state: absent -- include: ovs.yml +- include_tasks: ovs.yml when: netplugin_driver == "ovs" - name: Netplugin | Create Netplugin bin symlink diff --git a/roles/contiv/tasks/ovs.yml b/roles/contiv/tasks/ovs.yml index 0c1b994c7..5c92e90e9 100644 --- a/roles/contiv/tasks/ovs.yml +++ b/roles/contiv/tasks/ovs.yml @@ -1,5 +1,5 @@ --- -- include: packageManagerInstall.yml +- include_tasks: packageManagerInstall.yml when: source_type == "packageManager" tags: - binary-update diff --git a/roles/contiv/tasks/packageManagerInstall.yml b/roles/contiv/tasks/packageManagerInstall.yml index e0d48e643..d5726476c 100644 --- a/roles/contiv/tasks/packageManagerInstall.yml +++ b/roles/contiv/tasks/packageManagerInstall.yml @@ -3,7 +3,7 @@ set_fact: did_install: false -- include: pkgMgrInstallers/centos-install.yml +- include_tasks: pkgMgrInstallers/centos-install.yml when: (ansible_os_family == "RedHat") and not is_atomic |