diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2017-09-29 14:18:09 +0800 |
|---|---|---|
| committer |   Justin chi <chigang@huawei.com> | 2017-09-30 06:53:18 +0000 |
| commit | 58c599f20ed07bf2fb5b13150166452145e106a0 (patch) | |
| tree | 849eefca35f63adc059fd0ba649e33b99e3d9bb9 /plugins/odl_sfc/roles | |
| parent | 97027ad677f98d3301aa855814a1b7edd24f93af (diff) | |
SFC scenario release notes and bug fix for SFC switch
JIRA: COMPASS-562
Because of the inventory file modification, the sfc switch cannot be
enabled. Add a sperate sfc role to fix this bug.
Change-Id: If583d10ebbe78d0abe9078add24beb5f506dbda8
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
(cherry picked from commit 1c0f6a907f57e75529dcef959763220c10e7e1f0)
Diffstat (limited to 'plugins/odl_sfc/roles')
| -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 |