diff options
Diffstat (limited to 'deploy/adapters/ansible/roles/post-osa/tasks/main.yml')
| -rw-r--r-- | deploy/adapters/ansible/roles/post-osa/tasks/main.yml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/deploy/adapters/ansible/roles/post-osa/tasks/main.yml b/deploy/adapters/ansible/roles/post-osa/tasks/main.yml index f7f7a6cc..bd83b50f 100644 --- a/deploy/adapters/ansible/roles/post-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/post-osa/tasks/main.yml @@ -8,10 +8,18 @@ ############################################################################## --- - include: "{{ ansible_distribution }}.yml" - when: inventory_hostname in groups['compute'] + when: + - inventory_hostname in groups['compute'] + - ansible_distribution == 'Ubuntu' # install networking-sfc for non odl scenarios -- include: install_networking_sfc.yml +# - include: install_networking_sfc.yml +# when: +# - odl_sfc is not defined or odl_sfc == "Disable" +# - inventory_hostname not in groups['compute'] +# when: ansible_distribution == 'Ubuntu' + +- include: "{{ ansible_os_family }}.yml" when: - - odl_sfc is not defined or odl_sfc == "Disable" - - inventory_hostname not in groups['compute'] + - ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7' + - inventory_hostname in groups['compute'] |