From 6b956361494a573dfcd7e1440b8183e77be94ee4 Mon Sep 17 00:00:00 2001
From: Manuel Buil <mbuil@suse.com>
Date: Mon, 10 Sep 2018 16:49:39 +0200
Subject: Remove all Pike config

Due to the lack of developers, we will only support one version of
openstack (master). Therefore, we remove the Pike support which is
anyway not the latest stable anymore

Change-Id: Ib2c81f952b0e35c61a3edeb9b4e389f5cd27e956
Signed-off-by: Manuel Buil <mbuil@suse.com>
---
 .../tasks/add-sfc-repos-and-inventory-pike.yml     | 16 ------
 .../role/os-odl-sfc/tasks/copy-OSA-files-pike.yml  | 57 ----------------------
 .../os-odl-sfc/role/os-odl-sfc/tasks/main.yml      |  9 ----
 3 files changed, 82 deletions(-)
 delete mode 100644 scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-pike.yml
 delete mode 100644 scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.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-pike.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-pike.yml
deleted file mode 100644
index 3c80fa5e..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-pike.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-
-- name: Add networking-odl and networking-sfc repos
-  copy:
-    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
-  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 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/copy-OSA-files-pike.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml
deleted file mode 100644
index a9d197da..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-#
-
-- name: copy user_sfc_scenarios_variables.yml
-  copy:
-    src: "{{xci_flavor}}/user_sfc_scenarios_variables_pike.yml"
-    dest: "{{openstack_osa_etc_path}}/user_sfc_scenarios_variables.yml"
-
-- name: copy OPNFV role requirements
-  copy:
-    src: "ansible-role-requirements-pike.yml"
-    dest: "{{openstack_osa_path}}/ansible-role-requirements.yml"
-
-- 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"
-
-- name: copy tacker inventory file
-  copy:
-    src: "tacker_files/tacker.yml"
-    dest: "{{openstack_osa_etc_path}}/env.d/tacker.yml"
-
-- name: copy user_secrets.yml for tacker
-  copy:
-    src: "tacker_files/user_secrets.yml"
-    dest: "{{openstack_osa_etc_path}}/user_secrets.yml"
-
-- name: copy haproxy_config.yml for tacker
-  copy:
-    src: "tacker_files/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_pike.yml"
-    dest: "{{openstack_osa_path}}/playbooks/defaults/repo_packages/openstack_services.yml"
-
-- name: copy all/tacker.yml
-  copy:
-    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}}/group_vars/tacker_all.yml"
-
-- name: copy setup-openstack.yml
-  copy:
-    src: "tacker_files/setup-openstack.yml"
-    dest: "{{openstack_osa_path}}/playbooks/setup-openstack.yml"
-
-- name: copy os-tacker-install.yml
-  copy:
-    src: "tacker_files/os-tacker-install.yml"
-    dest: "{{openstack_osa_path}}/playbooks/os-tacker-install.yml"
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 628d8af8..270f6019 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,14 +8,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-- 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 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"
-- 
cgit 1.2.3-korg