diff options
Diffstat (limited to 'plugins/odl_sfc')
| -rwxr-xr-x | plugins/odl_sfc/roles/setup-odl-sfc/tasks/main.yml | 4 | ||||
| -rwxr-xr-x | plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/main.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/main.yml index e65be002..6b226688 100755 --- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/main.yml +++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/main.yml @@ -1,4 +1,6 @@ --- - include: odl-cluster.yml - when: opendaylight is defined and opendaylight == "Enable" + when: + - opendaylight is defined and opendaylight == "Enable" + - odl_sfc is defined and odl_sfc == "Enable" diff --git a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml index 09faaa27..07bf7084 100755 --- a/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml +++ b/plugins/odl_sfc/roles/setup-odl-sfc/tasks/odl-cluster.yml @@ -4,7 +4,7 @@ - include_vars: "{{ openstack_passwd_file }}" -- include_vars: odl-pre.yml +- include: odl-pre.yml when: inventory_hostname == "localhost" - include_vars: /tmp/odl-extra-vars.yml |