From 70a03eeda1163056dba689f470199c2c84f7123e Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Mon, 4 Dec 2017 10:07:58 +0100 Subject: Provide support for xci-master Change-Id: Id4e80be218c51f56324cb43aa27f580ac8c92c47 Signed-off-by: Manuel Buil --- .../role/os-odl-sfc/tasks/copy-OSA-files-master.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml') 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" -- cgit 1.2.3-korg