From 14d4de1dda0d0c4708c8cb9f5dff4060b628f477 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Fri, 16 Feb 2018 17:13:39 +0100 Subject: Update XCI deployment files We are now aligned with master so we don't need a-r-r file anymore or the OpenStack versions file Change-Id: Ida0b8f0414870d5fa3fecdc79564def345187b2e Signed-off-by: Manuel Buil --- .../os-odl-sfc/tasks/add-sfc-repos-and-inventory-master.yml | 6 ------ .../os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml | 10 ---------- scenarios/os-odl-sfc/role/os-odl-sfc/tasks/main.yml | 4 ---- 3 files changed, 20 deletions(-) delete mode 100644 scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-master.yml (limited to 'scenarios/os-odl-sfc/role/os-odl-sfc/tasks') 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 deleted file mode 100644 index 1cffdf8e..00000000 --- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-master.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- - -- 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" 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 f58de4c2..80e3ac01 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 @@ -13,16 +13,6 @@ dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_sfc_scenarios_variables.yml" when: ansible_pkg_mgr == 'apt' -- 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" - # To get the mano_host variable (can only be defined here for the inventory) - name: copy openstack_user_config.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 819ef203..f2c98e44 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 @@ -12,10 +12,6 @@ include: add-sfc-repos-and-inventory-pike.yml when: OPENSTACK_OSA_VERSION == "stable/pike" -- 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" -- cgit 1.2.3-korg