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)

5 files changed, 28 insertions, 9 deletions

diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index 49f76cc7..3f58435e 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -51,12 +51,18 @@
   roles:
     - setup-openvswitch
 
-- hosts: localhost
+- hosts:
+    - localhost
+    - neutron_all
+    - galera_container
+    - network_hosts
+    - repo_container
+    - utility
   remote_user: root
   roles:
-    - setup-sfc
+    - setup-odl
   tags:
-    - sfc
+    - odl
 
 - hosts:
     - localhost
@@ -67,9 +73,9 @@
     - utility
   remote_user: root
   roles:
-    - setup-odl
+    - setup-odl-sfc
   tags:
-    - odl
+    - odl_sfc
 
 - hosts:
     - utility_all[0]
diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index dc06bf05..85700385 100644
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -135,6 +135,16 @@ System Limitations
 
 **Min Jumphost requirements:** At least 16GB of RAM, 16 core CPU
 
+Scenario Limitations
+--------------------
+
+**ODL SFC:** In the Euphrates1.0, Compass doesn't integrate OpenStack Tacker
+Project yet. However, the SFC related test cases in Functest always use Tacker
+as NFVO to delivery VNFFG or SFC related requests to ODL via networking-sfc.
+So the odl-sfc scenario of Compass cannot pass the SFC testcases in Functest.
+But if you want to use verify SFC in the cluster deployed by Compass, you can
+use neutron CLI to achieve the same effect.
+
 Known issues
 ------------
 
@@ -145,7 +155,6 @@ Known issues
 |                       | the cluster cannot heal itself  |                       |
 +-----------------------+---------------------------------+-----------------------+
 
-
 Test Result
 ===========
 The Euphrates release with the Compass4nfv deployment toolchain has undergone QA test
diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/main.yml b/plugins/odl_cluster/roles/setup-odl/tasks/main.yml
index e65be002..96ca2f96 100755
--- a/plugins/odl_cluster/roles/setup-odl/tasks/main.yml
+++ b/plugins/odl_cluster/roles/setup-odl/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 not defined
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