[WIP] Adapt XCI scenarios for Fraser

We plan to support both stable/pike and master in the Fraser release

Change-Id: I5acd5d796a4ed376d5110d7268980faec9cec126
Signed-off-by: Manuel Buil <mbuil@suse.com>

5 files changed, 55 insertions, 12 deletions

diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-master.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-master.yml
new file mode 100644
index 00000000..9e1f6809
--- /dev/null
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-master.yml
@@ -0,0 +1,16 @@
+---
+
+- name: Add networking-odl and networking-sfc repos
+  copy:
+    src: openstack-ansible/playbooks/defaults/repo_packages/opendaylight-master.yml
+    dest: "{{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/opendaylight.yml"
+
+- name: Provide nova inventory which adds OVS-NSH hosts
+  copy:
+    src: openstack-ansible/playbooks/inventory_odl/env.d/nova.yml
+    dest: "{{OPENSTACK_OSA_PATH}}/playbooks/inventory/env.d/nova.yml"
+
+- name: Provide neutron inventory which adds ODL and OVS-NSH hosts
+  copy:
+    src: openstack-ansible/playbooks/inventory_odl/env.d/neutron.yml
+    dest: "{{OPENSTACK_OSA_PATH}}/playbooks/inventory/env.d/neutron.yml"
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-pike.yml
index 1a70c388..3396b83e 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-pike.yml
@@ -2,7 +2,7 @@
 
 - name: Add networking-odl and networking-sfc repos
   copy:
-    src: openstack-ansible/playbooks/defaults/repo_packages/opendaylight.yml
+    src: openstack-ansible/playbooks/defaults/repo_packages/opendaylight-pike.yml
     dest: "{{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/opendaylight.yml"
 
 - name: Provide nova inventory which adds OVS-NSH hosts
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml
new file mode 100644
index 00000000..cc291ef4
--- /dev/null
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml
@@ -0,0 +1,17 @@
+---
+#
+
+- name: copy user_sfc_scenarios_variables.yml
+  copy:
+    src: "{{XCI_FLAVOR}}/user_sfc_scenarios_variables.yml"
+    dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_sfc_scenarios_variables.yml"
+
+- name: copy OPNFV role requirements
+  copy:
+    src: "ansible-role-requirements-master.yml"
+    dest: "{{OPENSTACK_OSA_PATH}}/ansible-role-requirements.yml"
+
+- name: copy openstack_services.yml with tacker
+  copy:
+    src: "tacker_files/openstack_services-master.yml"
+    dest: "{{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/openstack_services.yml"
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml
index 5915ba1c..16e07005 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml
@@ -8,7 +8,7 @@
 
 - name: copy OPNFV role requirements
   copy:
-    src: "ansible-role-requirements.yml"
+    src: "ansible-role-requirements-pike.yml"
     dest: "{{OPENSTACK_OSA_PATH}}/ansible-role-requirements.yml"
 
 - name: copy openstack_user_config.yml
@@ -29,22 +29,22 @@
 - name: copy haproxy_config.yml for tacker
   copy:
     src: "tacker_files/haproxy_config.yml"
-    dest: "{{OPENSTACK_OSA_PATH}}/playbooks/vars/configs/haproxy_config.yml"
+    dest: "{{OPENSTACK_OSA_PATH}}/group_vars/all/haproxy_config.yml"
 
 - name: copy openstack_services.yml with tacker
   copy:
-    src: "tacker_files/openstack_services.yml"
+    src: "tacker_files/openstack_services_pike.yml"
     dest: "{{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/openstack_services.yml"
 
-- name: copy all.yml with tacker stuff
+- name: copy all/tacker.yml
   copy:
-    src: "tacker_files/all.yml"
-    dest: "{{OPENSTACK_OSA_PATH}}/playbooks/inventory/group_vars/all.yml"
+    src: "tacker_files/all_tacker.yml"
+    dest: "{{OPENSTACK_OSA_PATH}}/group_vars/all/tacker.yml"
 
 - name: copy tacker_all.yml
   copy:
     src: "tacker_files/tacker_all.yml"
-    dest: "{{OPENSTACK_OSA_PATH}}/playbooks/inventory/group_vars/tacker_all.yml"
+    dest: "{{OPENSTACK_OSA_PATH}}/group_vars/tacker_all.yml"
 
 - name: copy setup-openstack.yml
   copy:
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml
index f1fdcf2a..819ef203 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml
@@ -8,8 +8,18 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-- name: Add SFC repos and inventory
-  include: add-sfc-repos-and-inventory.yml
+- name: Add SFC repos and inventory for Pike
+  include: add-sfc-repos-and-inventory-pike.yml
+  when: OPENSTACK_OSA_VERSION == "stable/pike"
 
-- name: Copy the OSA not-yet-upstreamed files
-  include: copy-OSA-files.yml
+- name: Add SFC repos and inventory for master
+  include: add-sfc-repos-and-inventory-master.yml
+  when: OPENSTACK_OSA_VERSION != "stable/pike"
+
+- name: Copy the OSA not-yet-upstreamed files for Pike
+  include: copy-OSA-files-pike.yml
+  when: OPENSTACK_OSA_VERSION == "stable/pike"
+
+- name: Copy the OSA not-yet-upstreamed files for master
+  include: copy-OSA-files-master.yml
+  when: OPENSTACK_OSA_VERSION != "stable/pike"