summaryrefslogtreecommitdiffstats
path: root/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2017-12-04 10:07:58 +0100
committerManuel Buil <mbuil@suse.com>2017-12-13 08:28:10 +0000
commit70a03eeda1163056dba689f470199c2c84f7123e (patch)
treecae0ede942a4ebaef44f327aa4d41711501d4bfb /scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml
parentd4757d239155cbd21ce45b656469c10d67cdf569 (diff)
Provide support for xci-master
Change-Id: Id4e80be218c51f56324cb43aa27f580ac8c92c47 Signed-off-by: Manuel Buil <mbuil@suse.com>
Diffstat (limited to 'scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml')
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml19
1 files changed, 16 insertions, 3 deletions
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
index cc291ef4..f58de4c2 100644
--- 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
@@ -1,10 +1,17 @@
---
#
-- name: copy user_sfc_scenarios_variables.yml
+- name: copy user_sfc_scenarios_variables.yml (SUSE)
copy:
- src: "{{XCI_FLAVOR}}/user_sfc_scenarios_variables.yml"
+ src: "{{XCI_FLAVOR}}/user_sfc_scenarios_variables_suse.yml"
dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_sfc_scenarios_variables.yml"
+ when: ansible_pkg_mgr == 'zypper'
+
+- name: copy user_sfc_scenarios_variables.yml (Ubuntu)
+ copy:
+ src: "{{XCI_FLAVOR}}/user_sfc_scenarios_variables_ubuntu.yml"
+ dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_sfc_scenarios_variables.yml"
+ when: ansible_pkg_mgr == 'apt'
- name: copy OPNFV role requirements
copy:
@@ -13,5 +20,11 @@
- name: copy openstack_services.yml with tacker
copy:
- src: "tacker_files/openstack_services-master.yml"
+ src: "tacker_files/openstack_services_master.yml"
dest: "{{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/openstack_services.yml"
+
+# To get the mano_host variable (can only be defined here for the inventory)
+- name: copy openstack_user_config.yml
+ copy:
+ src: "tacker_files/{{XCI_FLAVOR}}/openstack_user_config.yml"
+ dest: "{{OPENSTACK_OSA_ETC_PATH}}/openstack_user_config.yml"