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>

18 files changed, 0 insertions, 1693 deletions

diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/ansible-role-requirements-pike.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ansible-role-requirements-pike.yml
deleted file mode 100644
index a954dccc..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/ansible-role-requirements-pike.yml
+++ /dev/null
@@ -1,212 +0,0 @@
-- name: ansible-hardening
-  scm: git
-  src: https://git.openstack.org/openstack/ansible-hardening
-  version: cee2e0b5b432c50614b908d9bf50ed2cc32d8daa
-- name: apt_package_pinning
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
-  version: 956e06cf66bd878b132c58bdd97304749c0da189
-- name: pip_install
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  version: e52f829e7386e43ca8a85ab820901740590dc6ea
-- name: galera_client
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-galera_client
-  version: 79b4bd9980b75355ec729bba37a440f4c88df106
-- name: galera_server
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-galera_server
-  version: 67628375be0e3996b0f5cbddf8e1b15d6ca85333
-- name: ceph_client
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
-  version: de60aa5d96cd6803674e8b398828205909aa54a6
-- name: haproxy_server
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
-  version: aacaaed2e36945baa7fb9e8bd6ceb8393dad3730
-- name: keepalived
-  scm: git
-  src: https://github.com/evrardjp/ansible-keepalived
-  version: 3.0.3
-- name: lxc_container_create
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
-  version: 8a3b201bbaa82a38bd162315efccec1ec244e481
-- name: lxc_hosts
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
-  version: a6f5052063e7ac4157da36c4d105fdb855abd366
-- name: memcached_server
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
-  version: 2c8cd40e18902b9aa6fab87e9fd299d437ed0a78
-- name: openstack_hosts
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
-  version: deb8d59ff40d9f828172933df6028202e6c9fb04
-- name: os_keystone
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
-  version: 782ec3eae6d43e00699b831859401b347273f7fd
-- name: openstack_openrc
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
-  version: 452a227ea5cf50611832cd289e163d577791407a
-- name: os_aodh
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
-  version: 0321e0bae7050b97fa8e3d66033fe177c31e2d63
-- name: os_barbican
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
-  version: 06ef75aa9aa9bd126bd17ab86a7c38f44d901203
-- name: os_ceilometer
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
-  version: 4b3e0589a0188de885659614ef4e076018af54f7
-- name: os_cinder
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: 9173876f6bfc5e2955d74628b32f5cff2e9e39c3
-- name: os_designate
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_designate
-  version: dd13917240c7dc9fff9df7e042ba32fb002838ce
-- name: os_glance
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_glance
-  version: 91e544aadae016c0e190d52a89ce0a1659a84641
-- name: os_gnocchi
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
-  version: 5f8950f61ed6b61d1cc06ab73b3b02466bee0db1
-- name: os_heat
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_heat
-  version: 4d1efae631026631fb2af4f43a9fe8ca210d643e
-- name: os_horizon
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
-  version: af4abbad26b4ab9ce3c50266bc212199e3e6aea8
-- name: os_ironic
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
-  version: 91abf2ec56b9b4337e5e98d9ba6f2c04155331a1
-- name: os_magnum
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
-  version: 0fdeea886ef4227e02d793f6dbfd54ccd9e6e088
-- name: os_molteniron
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron
-  version: 0506e3c3f511518cbd5e7499e2a675b25d4ac967
-- name: os_neutron
-  scm: git
-  src: https://github.com/manuelbuil/openstack-ansible-os_neutron
-  version: pike-SFC-support-Feb
-- name: os_nova
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_nova
-  version: 312959bea6d4d577c6a4146ae81fa4044ac26d14
-- name: os_octavia
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_octavia
-  version: 5fd1fbae703c17f928cfc00f60aeeed0500c6f2b
-- name: os_rally
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_rally
-  version: c91eb6cc61a1f4c2136084e0df758eed117f1bbb
-- name: os_sahara
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
-  version: c2ad98dcda096c34e9b63d4e44c9a231ed093fb4
-- name: os_swift
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_swift
-  version: 8f5f4be2c1040220e40b8bddbdf5e3b1a1d35baa
-- name: os_tempest
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
-  version: bcdfa619fe46629bdf5aa8cde5d1e843e7a7b576
-- name: os_trove
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_trove
-  version: 6596f6b28c88a88c89e293ea8f5f8551eb491fd1
-- name: plugins
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-plugins
-  version: 3601c1e006890899f3c794cb8654bfaca6c32d58
-- name: rabbitmq_server
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
-  version: 5add96f3d72fb07998da715c52c46eceb54d9c4a
-- name: repo_build
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-repo_build
-  version: 377c4376aef1c67c8f0cb3d3bca741bc102bf740
-- name: repo_server
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-repo_server
-  version: 63c6537fcb7fa688e1e82074ea958b9349f58cc7
-- name: rsyslog_client
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
-  version: 693255ee40a2908707fcc962d620d68008647a57
-- name: rsyslog_server
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
-  version: fa201bbadeb959f363ecba7046f052b2ee16e474
-- name: sshd
-  scm: git
-  src: https://github.com/willshersystems/ansible-sshd
-  version: 0.5.1
-- name: bird
-  scm: git
-  src: https://github.com/logan2211/ansible-bird
-  version: '1.4'
-- name: etcd
-  scm: git
-  src: https://github.com/logan2211/ansible-etcd
-  version: '1.3'
-- name: unbound
-  scm: git
-  src: https://github.com/logan2211/ansible-unbound
-  version: '1.5'
-- name: resolvconf
-  scm: git
-  src: https://github.com/logan2211/ansible-resolvconf
-  version: '1.3'
-- name: ceph-defaults
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-defaults
-  version: v3.0.8
-- name: ceph-common
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-common
-  version: v3.0.8
-- name: ceph-config
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-config
-  version: v3.0.8
-- name: ceph-mon
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-mon
-  version: v3.0.8
-- name: ceph-mgr
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-mgr
-  version: v3.0.8
-- name: ceph-osd
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-osd
-  version: v3.0.8
-- name: os_tacker
-  scm: git
-  src: https://github.com/manuelbuil/openstack-ansible-os_tacker
-  version: pike-SFC-support-Feb
-- name: opendaylight
-  scm: git
-  src: https://git.opendaylight.org/gerrit/p/integration/packaging/ansible-opendaylight.git
-  version: 4aabce0605ef0f51eef4d6564cc7d779630706c5
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/user_sfc_scenarios_variables_pike.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/user_sfc_scenarios_variables_pike.yml
deleted file mode 100644
index 002db2b1..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/user_sfc_scenarios_variables_pike.yml
+++ /dev/null
@@ -1,103 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ##
-# ## This file contains commonly used overrides for convenience. Please inspect
-# ## the defaults for each role to find additional override options.
-# ##
-
-# # Debug and Verbose options.
-debug: false
-
-haproxy_keepalived_external_vip_cidr: "192.168.122.220/32"
-haproxy_keepalived_internal_vip_cidr: "172.29.236.222/32"
-haproxy_keepalived_external_interface: br-vlan
-haproxy_keepalived_internal_interface: br-mgmt
-gnocchi_db_sync_options: ""
-
-ovs_nsh_support: true
-cluster: true
-
-# Ensure the openvswitch kernel module is loaded
-# openstack_host_specific_kernel_modules:
-#  - name: "openvswitch"
-#    pattern: "CONFIG_OPENVSWITCH"
-#    group: "network_hosts"
-
-# Use OpenDaylight SDN Controller
-neutron_plugin_type: "ml2.opendaylight"
-neutron_opendaylight_conf_ini_overrides:
-  ml2_odl:
-    username: "admin"
-    password: "admin"
-    port_binding_controller: "pseudo-agentdb-binding"
-    url: "http://{{ internal_lb_vip_address }}:8080/controller/nb/v2/neutron"
-neutron_plugin_base:
-  - odl-router_v2
-  - metering
-  - networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin
-  - networking_sfc.services.sfc.plugin.SfcPlugin
-provider_networks:
-  - network:
-      container_bridge: "br-mgmt"
-      container_type: "veth"
-      container_interface: "eth1"
-      ip_from_q: "container"
-      type: "raw"
-      group_binds:
-        - all_containers
-        - hosts
-      is_container_address: true
-      is_ssh_address: true
-  - network:
-      container_bridge: "br-vxlan"
-      container_type: "veth"
-      container_interface: "eth10"
-      ip_from_q: "tunnel"
-      type: "vxlan"
-      range: "1:1000"
-      net_name: "vxlan"
-      group_binds:
-        - neutron_openvswitch_agent
-  - network:
-      container_bridge: "br-vlan"
-      container_type: "veth"
-      container_interface: "eth12"
-      host_bind_override: "eth12"
-      type: "flat"
-      net_name: "flat"
-      group_binds:
-        - neutron_openvswitch_agent
-  - network:
-      container_bridge: "br-vlan"
-      container_type: "veth"
-      container_interface: "eth11"
-      host_bind_override: "eth12"
-      type: "vlan"
-      range: "1:1"
-      net_name: "vlan"
-      group_binds:
-        - neutron_openvswitch_agent
-  - network:
-      container_bridge: "br-storage"
-      container_type: "veth"
-      container_interface: "eth2"
-      ip_from_q: "storage"
-      type: "raw"
-      group_binds:
-        - glance_api
-        - cinder_api
-        - cinder_volume
-        - nova_compute
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/user_sfc_scenarios_variables_pike.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/user_sfc_scenarios_variables_pike.yml
deleted file mode 100644
index 4ee48807..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/user_sfc_scenarios_variables_pike.yml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ##
-# ## This file contains commonly used overrides for convenience. Please inspect
-# ## the defaults for each role to find additional override options.
-# ##
-
-# # Debug and Verbose options.
-debug: false
-
-haproxy_keepalived_external_vip_cidr: "192.168.122.3/32"
-haproxy_keepalived_internal_vip_cidr: "172.29.236.11/32"
-haproxy_keepalived_external_interface: br-vlan
-haproxy_keepalived_internal_interface: br-mgmt
-gnocchi_db_sync_options: ""
-
-ovs_nsh_support: true
-
-# Ensure the openvswitch kernel module is loaded
-# openstack_host_specific_kernel_modules:
-#  - name: "openvswitch"
-#    pattern: "CONFIG_OPENVSWITCH"
-#    group: "network_hosts"
-
-# Use OpenDaylight SDN Controller
-neutron_plugin_type: "ml2.opendaylight"
-neutron_opendaylight_conf_ini_overrides:
-  ml2_odl:
-    username: "admin"
-    password: "admin"
-    port_binding_controller: "pseudo-agentdb-binding"
-    url: "http://{{ hostvars[groups['neutron_server'][0]]['ansible_eth1']['ipv4']['address'] }}:8080/controller/nb/v2/neutron"
-neutron_plugin_base:
-  - odl-router_v2
-  - metering
-  - networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin
-  - networking_sfc.services.sfc.plugin.SfcPlugin
-provider_networks:
-  - network:
-      container_bridge: "br-mgmt"
-      container_type: "veth"
-      container_interface: "eth1"
-      ip_from_q: "container"
-      type: "raw"
-      group_binds:
-        - all_containers
-        - hosts
-      is_container_address: true
-      is_ssh_address: true
-  - network:
-      container_bridge: "br-vxlan"
-      container_type: "veth"
-      container_interface: "eth10"
-      ip_from_q: "tunnel"
-      type: "vxlan"
-      range: "1:1000"
-      net_name: "vxlan"
-      group_binds:
-        - neutron_openvswitch_agent
-  - network:
-      container_bridge: "br-vlan"
-      container_type: "veth"
-      container_interface: "eth12"
-      host_bind_override: "eth12"
-      type: "flat"
-      net_name: "flat"
-      group_binds:
-        - neutron_openvswitch_agent
-  - network:
-      container_bridge: "br-vlan"
-      container_type: "veth"
-      container_interface: "eth11"
-      host_bind_override: "eth12"
-      type: "vlan"
-      range: "1:1"
-      net_name: "vlan"
-      group_binds:
-        - neutron_openvswitch_agent
-  - network:
-      container_bridge: "br-storage"
-      container_type: "veth"
-      container_interface: "eth2"
-      ip_from_q: "storage"
-      type: "raw"
-      group_binds:
-        - glance_api
-        - cinder_api
-        - cinder_volume
-        - nova_compute
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/user_sfc_scenarios_variables_pike.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/user_sfc_scenarios_variables_pike.yml
deleted file mode 100644
index 4ee48807..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/user_sfc_scenarios_variables_pike.yml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ##
-# ## This file contains commonly used overrides for convenience. Please inspect
-# ## the defaults for each role to find additional override options.
-# ##
-
-# # Debug and Verbose options.
-debug: false
-
-haproxy_keepalived_external_vip_cidr: "192.168.122.3/32"
-haproxy_keepalived_internal_vip_cidr: "172.29.236.11/32"
-haproxy_keepalived_external_interface: br-vlan
-haproxy_keepalived_internal_interface: br-mgmt
-gnocchi_db_sync_options: ""
-
-ovs_nsh_support: true
-
-# Ensure the openvswitch kernel module is loaded
-# openstack_host_specific_kernel_modules:
-#  - name: "openvswitch"
-#    pattern: "CONFIG_OPENVSWITCH"
-#    group: "network_hosts"
-
-# Use OpenDaylight SDN Controller
-neutron_plugin_type: "ml2.opendaylight"
-neutron_opendaylight_conf_ini_overrides:
-  ml2_odl:
-    username: "admin"
-    password: "admin"
-    port_binding_controller: "pseudo-agentdb-binding"
-    url: "http://{{ hostvars[groups['neutron_server'][0]]['ansible_eth1']['ipv4']['address'] }}:8080/controller/nb/v2/neutron"
-neutron_plugin_base:
-  - odl-router_v2
-  - metering
-  - networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin
-  - networking_sfc.services.sfc.plugin.SfcPlugin
-provider_networks:
-  - network:
-      container_bridge: "br-mgmt"
-      container_type: "veth"
-      container_interface: "eth1"
-      ip_from_q: "container"
-      type: "raw"
-      group_binds:
-        - all_containers
-        - hosts
-      is_container_address: true
-      is_ssh_address: true
-  - network:
-      container_bridge: "br-vxlan"
-      container_type: "veth"
-      container_interface: "eth10"
-      ip_from_q: "tunnel"
-      type: "vxlan"
-      range: "1:1000"
-      net_name: "vxlan"
-      group_binds:
-        - neutron_openvswitch_agent
-  - network:
-      container_bridge: "br-vlan"
-      container_type: "veth"
-      container_interface: "eth12"
-      host_bind_override: "eth12"
-      type: "flat"
-      net_name: "flat"
-      group_binds:
-        - neutron_openvswitch_agent
-  - network:
-      container_bridge: "br-vlan"
-      container_type: "veth"
-      container_interface: "eth11"
-      host_bind_override: "eth12"
-      type: "vlan"
-      range: "1:1"
-      net_name: "vlan"
-      group_binds:
-        - neutron_openvswitch_agent
-  - network:
-      container_bridge: "br-storage"
-      container_type: "veth"
-      container_interface: "eth2"
-      ip_from_q: "storage"
-      type: "raw"
-      group_binds:
-        - glance_api
-        - cinder_api
-        - cinder_volume
-        - nova_compute
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/defaults/repo_packages/opendaylight-pike.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/defaults/repo_packages/opendaylight-pike.yml
deleted file mode 100644
index d4a0b931..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/defaults/repo_packages/opendaylight-pike.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-# Copyright 2017, Ericsson AB
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl
-networking_odl_git_install_branch: stable/pike
-networking_odl_project_group: neutron_all
-
-networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc
-networking_sfc_git_install_branch: stable/pike
-networking_sfc_project_group: neutron_all
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/inventory_odl/env.d/neutron.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/inventory_odl/env.d/neutron.yml
deleted file mode 100644
index fd74d8ac..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/inventory_odl/env.d/neutron.yml
+++ /dev/null
@@ -1,97 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-component_skel:
-  neutron_agent:
-    belongs_to:
-      - neutron_all
-  neutron_dhcp_agent:
-    belongs_to:
-      - neutron_all
-  neutron_linuxbridge_agent:
-    belongs_to:
-      - neutron_all
-  neutron_openvswitch_agent:
-    belongs_to:
-      - neutron_all
-  neutron_metering_agent:
-    belongs_to:
-      - neutron_all
-  neutron_l3_agent:
-    belongs_to:
-      - neutron_all
-  neutron_lbaas_agent:
-    belongs_to:
-      - neutron_all
-  neutron_bgp_dragent:
-    belongs_to:
-      - neutron_all
-  neutron_metadata_agent:
-    belongs_to:
-      - neutron_all
-  neutron_sriov_nic_agent:
-    belongs_to:
-      - neutron_all
-  neutron_server:
-    belongs_to:
-      - neutron_all
-  opendaylight:
-    belongs_to:
-      - neutron_all
-  openvswitch_nsh:
-    belongs_to:
-      - neutron_all
-
-container_skel:
-  neutron_agents_container:
-    belongs_to:
-      - network_containers
-    contains:
-      - neutron_agent
-      - neutron_metadata_agent
-      - neutron_metering_agent
-      - neutron_linuxbridge_agent
-      - neutron_openvswitch_agent
-      - openvswitch_nsh
-      - neutron_l3_agent
-      - neutron_dhcp_agent
-      - neutron_lbaas_agent
-      - neutron_bgp_dragent
-    properties:
-      service_name: neutron
-  neutron_server_container:
-    belongs_to:
-      - network_containers
-    contains:
-      - neutron_server
-      - opendaylight
-    properties:
-      service_name: neutron
-  neutron_networking_container:
-    belongs_to:
-      - network_containers
-    contains:
-      - openvswitch_nsh
-    properties:
-      is_metal: true
-
-
-physical_skel:
-  network_containers:
-    belongs_to:
-      - all_containers
-  network_hosts:
-    belongs_to:
-      - hosts
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/inventory_odl/env.d/nova.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/inventory_odl/env.d/nova.yml
deleted file mode 100644
index 1aee092e..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/inventory_odl/env.d/nova.yml
+++ /dev/null
@@ -1,115 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-component_skel:
-  nova_api_metadata:
-    belongs_to:
-      - nova_all
-  nova_api_os_compute:
-    belongs_to:
-      - nova_all
-  nova_api_placement:
-    belongs_to:
-      - nova_all
-  nova_compute:
-    belongs_to:
-      - nova_all
-  nova_conductor:
-    belongs_to:
-      - nova_all
-  nova_scheduler:
-    belongs_to:
-      - nova_all
-  nova_console:
-    belongs_to:
-      - nova_all
-
-
-container_skel:
-  nova_api_metadata_container:
-    belongs_to:
-      - compute-infra_containers
-      - os-infra_containers
-    contains:
-      - nova_api_metadata
-    properties:
-      service_name: nova
-  nova_api_os_compute_container:
-    belongs_to:
-      - compute-infra_containers
-      - os-infra_containers
-    contains:
-      - nova_api_os_compute
-    properties:
-      service_name: nova
-  nova_api_placement_container:
-    belongs_to:
-      - compute-infra_containers
-      - os-infra_containers
-    contains:
-      - nova_api_placement
-    properties:
-      service_name: nova
-  nova_compute_container:
-    belongs_to:
-      - compute_containers
-    contains:
-      - neutron_linuxbridge_agent
-      - neutron_openvswitch_agent
-      - openvswitch_nsh
-      - neutron_sriov_nic_agent
-      - nova_compute
-    properties:
-      is_metal: true
-      service_name: nova
-  nova_conductor_container:
-    belongs_to:
-      - compute-infra_containers
-      - os-infra_containers
-    contains:
-      - nova_conductor
-    properties:
-      service_name: nova
-  nova_scheduler_container:
-    belongs_to:
-      - compute-infra_containers
-      - os-infra_containers
-    contains:
-      - nova_scheduler
-    properties:
-      service_name: nova
-  nova_console_container:
-    belongs_to:
-      - compute-infra_containers
-      - os-infra_containers
-    contains:
-      - nova_console
-    properties:
-      service_name: nova
-
-
-physical_skel:
-  compute-infra_containers:
-    belongs_to:
-      - all_containers
-  compute-infra_hosts:
-    belongs_to:
-      - hosts
-  compute_containers:
-    belongs_to:
-      - all_containers
-  compute_hosts:
-    belongs_to:
-      - hosts
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/all_tacker.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/all_tacker.yml
deleted file mode 100644
index 0d6b15ec..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/all_tacker.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Tacker
-tacker_service_user_name: tacker
-tacker_service_tenant_name: service
-
-tacker_rabbitmq_userid: tacker
-tacker_rabbitmq_vhost: /tacker
-tacker_rabbitmq_port: "{{ rabbitmq_port }}"
-tacker_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-tacker_rabbitmq_servers: "{{ rabbitmq_servers }}"
-tacker_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
-
-tacker_service_publicuri: "{{ openstack_service_publicuri_proto|default(tacker_service_proto) }}://{{ external_lb_vip_address }}:{{ tacker_service_port }}"
-tacker_service_adminurl: "{{ tacker_service_adminuri }}/"
-
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/haproxy_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/haproxy_config.yml
deleted file mode 100644
index 49b58360..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/haproxy_config.yml
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-haproxy_default_services:
-  - service:
-      haproxy_service_name: galera
-      haproxy_backend_nodes: "{{ [groups['galera_all'][0]] | default([]) }}"  # list expected
-      haproxy_backup_nodes: "{{ groups['galera_all'][1:] | default([]) }}"
-      haproxy_bind: "{{ [internal_lb_vip_address] }}"
-      haproxy_port: 3306
-      haproxy_balance_type: tcp
-      haproxy_timeout_client: 5000s
-      haproxy_timeout_server: 5000s
-      haproxy_backend_options:
-        - "mysql-check user {{ galera_monitoring_user }}"
-      haproxy_whitelist_networks: "{{ haproxy_galera_whitelist_networks }}"
-  - service:
-      haproxy_service_name: repo_git
-      haproxy_backend_nodes: "{{ groups['repo_all'] | default([]) }}"
-      haproxy_bind: "{{ [internal_lb_vip_address] }}"
-      haproxy_port: 9418
-      haproxy_balance_type: tcp
-      haproxy_backend_options:
-        - tcp-check
-      haproxy_whitelist_networks: "{{ haproxy_repo_git_whitelist_networks }}"
-  - service:
-      haproxy_service_name: repo_all
-      haproxy_backend_nodes: "{{ groups['repo_all'] | default([]) }}"
-      haproxy_bind: "{{ [internal_lb_vip_address] }}"
-      haproxy_port: 8181
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-  - service:
-      haproxy_service_name: repo_cache
-      haproxy_backend_nodes: "{{ [groups['repo_all'][0]] | default([]) }}"  # list expected
-      haproxy_backup_nodes: "{{ groups['repo_all'][1:] | default([]) }}"
-      haproxy_bind: "{{ [internal_lb_vip_address] }}"
-      haproxy_port: "{{ repo_pkg_cache_port }}"
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk HEAD /acng-report.html"
-      haproxy_whitelist_networks: "{{ haproxy_repo_cache_whitelist_networks }}"
-  - service:
-      haproxy_service_name: glance_api
-      haproxy_backend_nodes: "{{ groups['glance_api'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 9292
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk /healthcheck"
-  - service:
-      haproxy_service_name: glance_registry
-      haproxy_backend_nodes: "{{ groups['glance_registry'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 9191
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk /healthcheck"
-      haproxy_whitelist_networks: "{{ haproxy_glance_registry_whitelist_networks }}"
-  - service:
-      haproxy_service_name: gnocchi
-      haproxy_backend_nodes: "{{ groups['gnocchi_all'] | default([]) }}"
-      haproxy_port: 8041
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk /healthcheck"
-  - service:
-      haproxy_service_name: heat_api_cfn
-      haproxy_backend_nodes: "{{ groups['heat_api_cfn'] | default([]) }}"
-      haproxy_port: 8000
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-  - service:
-      haproxy_service_name: heat_api_cloudwatch
-      haproxy_backend_nodes: "{{ groups['heat_api_cloudwatch'] | default([]) }}"
-      haproxy_port: 8003
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-  - service:
-      haproxy_service_name: heat_api
-      haproxy_backend_nodes: "{{ groups['heat_api'] | default([]) }}"
-      haproxy_port: 8004
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-  - service:
-      haproxy_service_name: keystone_service
-      haproxy_backend_nodes: "{{ groups['keystone_all'] | default([])  }}"
-      haproxy_port: 5000
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_balance_type: "http"
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-  - service:
-      haproxy_service_name: keystone_admin
-      haproxy_backend_nodes: "{{ groups['keystone_all'] | default([])  }}"
-      haproxy_port: 35357
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_balance_type: "http"
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-      haproxy_whitelist_networks: "{{ haproxy_keystone_admin_whitelist_networks }}"
-  - service:
-      haproxy_service_name: neutron_server
-      haproxy_backend_nodes: "{{ groups['neutron_server'] | default([]) }}"
-      haproxy_port: 9696
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk GET /"
-  - service:
-      haproxy_service_name: nova_api_metadata
-      haproxy_backend_nodes: "{{ groups['nova_api_metadata'] | default([]) }}"
-      haproxy_port: 8775
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-      haproxy_whitelist_networks: "{{ haproxy_nova_metadata_whitelist_networks }}"
-  - service:
-      haproxy_service_name: nova_api_os_compute
-      haproxy_backend_nodes: "{{ groups['nova_api_os_compute'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 8774
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-  - service:
-      haproxy_service_name: nova_api_placement
-      haproxy_backend_nodes: "{{ groups['nova_api_placement'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 8780
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-      haproxy_backend_httpcheck_options:
-        - "expect status 401"
-  - service:
-      haproxy_service_name: nova_console
-      haproxy_backend_nodes: "{{ groups['nova_console'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: "{{ nova_console_port }}"
-      haproxy_balance_type: http
-      haproxy_timeout_client: 60m
-      haproxy_timeout_server: 60m
-      haproxy_balance_alg: source
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-      haproxy_backend_httpcheck_options:
-        - "expect status 404"
-  - service:
-      haproxy_service_name: cinder_api
-      haproxy_backend_nodes: "{{ groups['cinder_api'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 8776
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-  - service:
-      haproxy_service_name: horizon
-      haproxy_backend_nodes: "{{ groups['horizon_all'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_ssl_all_vips: true
-      haproxy_port: "{{ haproxy_ssl | ternary(443,80) }}"
-      haproxy_backend_port: 80
-      haproxy_redirect_http_port: 80
-      haproxy_balance_type: http
-      haproxy_balance_alg: source
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-  - service:
-      haproxy_service_name: sahara_api
-      haproxy_backend_nodes: "{{ groups['sahara_api'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_balance_alg: source
-      haproxy_port: 8386
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk /healthcheck"
-  - service:
-      haproxy_service_name: swift_proxy
-      haproxy_backend_nodes: "{{ groups['swift_proxy'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_balance_alg: source
-      haproxy_port: 8080
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk /healthcheck"
-  - service:
-      haproxy_service_name: aodh_api
-      haproxy_backend_nodes: "{{ groups['aodh_api'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 8042
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-      haproxy_backend_httpcheck_options:
-        - "expect status 401"
-  - service:
-      haproxy_service_name: ironic_api
-      haproxy_backend_nodes: "{{ groups['ironic_api'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 6385
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk GET /"
-  - service:
-      haproxy_service_name: rabbitmq_mgmt
-      haproxy_backend_nodes: "{{ groups['rabbitmq'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 15672
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-      haproxy_whitelist_networks: "{{ haproxy_rabbitmq_management_whitelist_networks }}"
-  - service:
-      haproxy_service_name: magnum
-      haproxy_backend_nodes: "{{ groups['magnum_all'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 9511
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk GET /"
-  - service:
-      haproxy_service_name: trove
-      haproxy_backend_nodes: "{{ groups['trove_api'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 8779
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk HEAD /"
-  - service:
-      haproxy_service_name: barbican
-      haproxy_backend_nodes: "{{ groups['barbican_api'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 9311
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk GET /"
-  - service:
-      haproxy_service_name: designate_api
-      haproxy_backend_nodes: "{{ groups['designate_api'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 9001
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "forwardfor"
-        - "httpchk /versions"
-        - "httplog"
-  - service:
-      haproxy_service_name: octavia
-      haproxy_backend_nodes: "{{ groups['octavia_all'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 9876
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "httpchk GET /"
-      haproxy_whitelist_networks: "{{ haproxy_octavia_whitelist_networks }}"
-  - service:
-      haproxy_service_name: tacker
-      haproxy_backend_nodes: "{{ groups['tacker_all'] | default([]) }}"
-      haproxy_port: 9890
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_balance_type: http
-      haproxy_backend_options:
-        - "forwardfor"
-        - "httpchk"
-        - "httplog"
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/openstack_services_pike.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/openstack_services_pike.yml
deleted file mode 100644
index 59182abb..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/openstack_services_pike.yml
+++ /dev/null
@@ -1,217 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-## NOTICE on items in this file:
-##   * If you use anything in the *._git_install_branch field that is not a TAG
-##     make sure to leave an in-line comment as to "why".
-
-## For the sake of anyone else editing this file:
-##   * If you add services to this file please do so in alphabetical order.
-##   * Every entry should be name spaced with the name of the client followed by an "_"
-##   * All items with this file should be separated by `name_` note that the name of the
-##     package should be one long name with no additional `_` separating it.
-
-
-### Before this is shipped all of these services should have a tag set as the branch,
-### or have a comment / reason attached to them as to why a tag can not work.
-
-
-## Global Requirements
-requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: 6b102588bd6c817d1957236fc24779b8912b3353 # HEAD of "stable/pike" as of 16.02.2018
-
-
-## Aodh service
-aodh_git_repo: https://git.openstack.org/openstack/aodh
-aodh_git_install_branch: f0ec11eef92d39bd3f07e026a404e2e7aa7fa6bc # HEAD of "stable/pike" as of 16.02.2018
-aodh_git_project_group: aodh_all
-
-
-## Barbican service
-barbican_git_repo: https://git.openstack.org/openstack/barbican
-barbican_git_install_branch: 1d20692a6fe77eacdafdd307498bb11da285c437 # HEAD of "stable/pike" as of 16.02.2018
-barbican_git_project_group: barbican_all
-
-
-## Ceilometer service
-ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
-ceilometer_git_install_branch: 35a33b6daacfb9792382d4d5da4880737ab78fed # HEAD of "stable/pike" as of 16.02.2018
-ceilometer_git_project_group: ceilometer_all
-
-
-## Cinder service
-cinder_git_repo: https://git.openstack.org/openstack/cinder
-cinder_git_install_branch: 4fb3a702ba8c3de24c41a6f706597bfa81e60435 # HEAD of "stable/pike" as of 16.02.2018
-cinder_git_project_group: cinder_all
-
-
-## Designate service
-designate_git_repo: https://git.openstack.org/openstack/designate
-designate_git_install_branch: 12fbb38799d6731862f07a9e299d5476a5c02f90 # HEAD of "stable/pike" as of 16.02.2018
-designate_git_project_group: designate_all
-
-
-## Horizon Designate dashboard plugin
-designate_dashboard_git_repo: https://git.openstack.org/openstack/designate-dashboard
-designate_dashboard_git_install_branch: bc128a7c29a427933fc4ca94a7510ef8c97e5206 # HEAD of "stable/pike" as of 16.02.2018
-designate_dashboard_git_project_group: horizon_all
-
-
-## Dragonflow service
-dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow
-dragonflow_git_install_branch: 84f1a26ff8e976b753593dc445e09a4c1a675a21 # Frozen HEAD of "master" as of 14.10.2017 (no stable/pike branch)
-dragonflow_git_project_group: neutron_all
-
-
-## Glance service
-glance_git_repo: https://git.openstack.org/openstack/glance
-glance_git_install_branch: 5c1f76d91012c9cc7b12f76e917af9e9a9bb7667 # HEAD of "stable/pike" as of 16.02.2018
-glance_git_project_group: glance_all
-
-
-## Heat service
-heat_git_repo: https://git.openstack.org/openstack/heat
-heat_git_install_branch: cda1cf15f4a20355c58bd26e2f4ce00007a15266 # HEAD of "stable/pike" as of 16.02.2018
-heat_git_project_group: heat_all
-
-
-## Horizon service
-horizon_git_repo: https://git.openstack.org/openstack/horizon
-horizon_git_install_branch: 5d77b95586fd5491b3dee5d5c199c34f53680370 # HEAD of "stable/pike" as of 16.02.2018
-horizon_git_project_group: horizon_all
-
-## Horizon Ironic dashboard plugin
-ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui
-ironic_dashboard_git_install_branch: ca9f9f1e9c2baba5415bee2e7961221a3daa6da6 # HEAD of "stable/pike" as of 16.02.2018
-ironic_dashboard_git_project_group: horizon_all
-
-## Horizon Magnum dashboard plugin
-magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui
-magnum_dashboard_git_install_branch: 0b9fc50aada1a3e214acaad1204b48c96a549e5f # HEAD of "stable/pike" as of 16.02.2018
-magnum_dashboard_git_project_group: horizon_all
-
-## Horizon LBaaS dashboard plugin
-neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard
-neutron_lbaas_dashboard_git_install_branch: f51341588490baca3795b6f068347cd2260d2e3b # HEAD of "stable/pike" as of 16.02.2018
-neutron_lbaas_dashboard_git_project_group: horizon_all
-
-## Horizon Sahara dashboard plugin
-sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard
-sahara_dashboard_git_install_branch: d56477dba6f4073ab4df6126bb489743779a3270 # HEAD of "stable/pike" as of 16.02.2018
-sahara_dashboard_git_project_group: horizon_all
-
-
-## Keystone service
-keystone_git_repo: https://git.openstack.org/openstack/keystone
-keystone_git_install_branch: e8953d03926b2a5594bbc3d5d8af6854b97cddb7 # HEAD of "stable/pike" as of 16.02.2018
-keystone_git_project_group: keystone_all
-
-
-## Neutron service
-neutron_git_repo: https://git.openstack.org/openstack/neutron
-neutron_git_install_branch: f9fcf5e34ac68ec44c4b61bd76117d2d9213792b # HEAD of "stable/pike" as of 16.02.2018
-neutron_git_project_group: neutron_all
-
-neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
-neutron_lbaas_git_install_branch: 49448db1a69d53ad0d137216b1805690a7daef45 # HEAD of "stable/pike" as of 16.02.2018
-neutron_lbaas_git_project_group: neutron_all
-
-neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
-neutron_vpnaas_git_install_branch: 60e4e7113b5fbbf28e97ebce2f40b7f1675200e6 # HEAD of "stable/pike" as of 16.02.2018
-neutron_vpnaas_git_project_group: neutron_all
-
-neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
-neutron_fwaas_git_install_branch: ea4e95913d843d72c8a3079203171813ba69895d # HEAD of "stable/pike" as of 16.02.2018
-neutron_fwaas_git_project_group: neutron_all
-
-neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing
-neutron_dynamic_routing_git_install_branch: 9098d4447581117e857d2f86fb4a0508b5ffbb6a # HEAD of "stable/pike" as of 16.02.2018
-neutron_dynamic_routing_git_project_group: neutron_all
-
-networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
-networking_calico_git_install_branch: cc3628125775f2f1b3c57c95db3d6b50278dc92b # HEAD of "master" as of 16.02.2018
-networking_calico_git_project_group: neutron_all
-
-## Nova service
-nova_git_repo: https://git.openstack.org/openstack/nova
-nova_git_install_branch: 806eda3da84d6f9b47c036ff138415458b837536 # HEAD of "stable/pike" as of 16.02.2018
-nova_git_project_group: nova_all
-
-
-## PowerVM Virt Driver
-nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm
-nova_powervm_git_install_branch: e0b516ca36fa5dfd38ae6f7ea97afd9a52f313ed # HEAD of "stable/pike" as of 16.02.2018
-nova_powervm_git_project_group: nova_all
-
-
-## LXD Virt Driver
-nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd
-nova_lxd_git_install_branch: 9747c274138d9ef40512d5015e9e581f6bbec5d9 # HEAD of "stable/pike" as of 16.02.2018
-nova_lxd_git_project_group: nova_all
-
-
-## Sahara service
-sahara_git_repo: https://git.openstack.org/openstack/sahara
-sahara_git_install_branch: a39c690aeca04dcde56384448ce577fd50eb8bf1 # HEAD of "stable/pike" as of 16.02.2018
-sahara_git_project_group: sahara_all
-
-
-## Swift service
-swift_git_repo: https://git.openstack.org/openstack/swift
-swift_git_install_branch: 0ff2d5e3b85a42914a89eac64ed9a87172334a2c # HEAD of "stable/pike" as of 16.02.2018
-swift_git_project_group: swift_all
-
-
-## Swift3 middleware
-swift_swift3_git_repo: https://git.openstack.org/openstack/swift3
-swift_swift3_git_install_branch: 1c117c96dda8113c3398c16e68b61efef397de74 # HEAD of "master" as of 16.02.2018
-swift_swift3_git_project_group: swift_all
-
-
-## Ironic service
-ironic_git_repo: https://git.openstack.org/openstack/ironic
-ironic_git_install_branch: f6f55a74526e906d061f9abcd9a1ad704f6dcfe5 # HEAD of "stable/pike" as of 16.02.2018
-ironic_git_project_group: ironic_all
-
-## Magnum service
-magnum_git_repo: https://git.openstack.org/openstack/magnum
-magnum_git_install_branch: 6d9914de87a67cd5dd33f9f37b49a28486c52cc6 # HEAD of "stable/pike" as of 16.02.2018
-magnum_git_project_group: magnum_all
-
-## Trove service
-trove_git_repo: https://git.openstack.org/openstack/trove
-trove_git_install_branch: 2a39699f8612a8f82dfce68949b714d19a102499 # HEAD of "stable/pike" as of 16.02.2018
-trove_git_project_group: trove_all
-
-## Horizon Trove dashboard plugin
-trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard
-trove_dashboard_git_install_branch: bffd0776d139f38f96ce8ded07ccde4b5a41bc7a # HEAD of "stable/pike" as of 16.02.2018
-trove_dashboard_git_project_group: horizon_all
-
-## Octavia service
-octavia_git_repo: https://git.openstack.org/openstack/octavia
-octavia_git_install_branch: a39cf133518716dc1a60069f5aa46afa384db3a8 # HEAD of "stable/pike" as of 16.02.2018
-octavia_git_project_group: octavia_all
-
-## Molteniron service
-molteniron_git_repo: https://git.openstack.org/openstack/molteniron
-molteniron_git_install_branch: 094276cda77d814d07ad885e7d63de8d1243750a # HEAD of "master" as of 16.02.2018
-molteniron_git_project_group: molteniron_all
-
-## Tacker service
-tacker_git_repo: https://github.com/manuelbuil/tacker
-tacker_git_install_branch: pike-SFC-support-Feb
-tacker_git_project_group: tacker_all
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/os-tacker-install.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/os-tacker-install.yml
deleted file mode 100644
index dd965951..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/os-tacker-install.yml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-# Copyright 2017, SUSE LINUX GmbH.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Install the tacker components
-  hosts: tacker_all
-  gather_facts: "{{ gather_facts | default(True) }}"
-  max_fail_percentage: 20
-  user: root
-  pre_tasks:
-    - include: common-tasks/os-lxc-container-setup.yml
-    - include: common-tasks/rabbitmq-vhost-user.yml
-      static: no
-      vars:
-        user: "{{ tacker_rabbitmq_userid }}"
-        password: "{{ tacker_rabbitmq_password }}"
-        vhost: "{{ tacker_rabbitmq_vhost }}"
-        _rabbitmq_host_group: "{{ tacker_rabbitmq_host_group }}"
-      when:
-        - inventory_hostname == groups['tacker_all'][0]
-        - groups[tacker_rabbitmq_host_group] | length > 0
-    - include: common-tasks/os-log-dir-setup.yml
-      vars:
-        log_dirs:
-          - src: "/openstack/log/{{ inventory_hostname }}-tacker"
-            dest: "/var/log/tacker"
-    - include: common-tasks/mysql-db-user.yml
-      static: no
-      vars:
-        user_name: "{{ tacker_galera_user }}"
-        password: "{{ tacker_container_mysql_password }}"
-        login_host: "{{ tacker_galera_address }}"
-        db_name: "{{ tacker_galera_database }}"
-      when: inventory_hostname == groups['tacker_all'][0]
-    - include: common-tasks/package-cache-proxy.yml
-  roles:
-    - role: "os_tacker"
-    - role: "openstack_openrc"
-      tags:
-        - openrc
-    - role: "rsyslog_client"
-      rsyslog_client_log_rotate_file: tacker_log_rotate
-      rsyslog_client_log_dir: "/var/log/tacker"
-      rsyslog_client_config_name: "99-tacker-rsyslog-client.conf"
-      tags:
-        - rsyslog
-  vars:
-    is_metal: "{{ properties.is_metal|default(false) }}"
-    tacker_galera_address: "{{ internal_lb_vip_address }}"
-  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - tacker
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/setup-openstack.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/setup-openstack.yml
deleted file mode 100644
index 94bb5291..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/setup-openstack.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- include: os-keystone-install.yml
-- include: os-barbican-install.yml
-- include: os-glance-install.yml
-- include: os-cinder-install.yml
-- include: os-nova-install.yml
-- include: os-neutron-install.yml
-- include: os-heat-install.yml
-- include: os-horizon-install.yml
-- include: os-ceilometer-install.yml
-- include: os-aodh-install.yml
-- include: os-designate-install.yml
-#NOTE(stevelle) Ensure Gnocchi identities exist before Swift
-- include: os-gnocchi-install.yml
-  when:
-    - gnocchi_storage_driver is defined
-    - gnocchi_storage_driver == 'swift'
-  vars:
-    gnocchi_identity_only: True
-- include: os-swift-install.yml
-- include: os-gnocchi-install.yml
-- include: os-tacker-install.yml
-- include: os-ironic-install.yml
-- include: os-magnum-install.yml
-- include: os-trove-install.yml
-- include: os-sahara-install.yml
-- include: os-molteniron-install.yml
-- include: os-octavia-install.yml
-- include: os-tempest-install.yml
-  when: (tempest_install | default(False)) | bool or (tempest_run | default(False)) | bool
-
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/tacker.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/tacker.yml
deleted file mode 100644
index 9ceabbc2..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/tacker.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-# Copyright 2017, SUSE Linux GmbH
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-component_skel:
-  tacker_server:
-    belongs_to:
-      - tacker_all
-
-
-container_skel:
-  tacker_container:
-    belongs_to:
-      - mano_containers
-    contains:
-      - tacker_server
-
-
-physical_skel:
-  mano_containers:
-    belongs_to:
-    - all_containers
-  mano_hosts:
-    belongs_to:
-    - hosts
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/tacker_all.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/tacker_all.yml
deleted file mode 100644
index 2a01a160..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/tacker_all.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-# Copyright 2017, SUSE LINUX GmbH
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-tacker_service_region: "{{ service_region }}"
-tacker_service_in_ldap: "{{ service_ldap_backend_enabled }}"
-
-tacker_aodh_enabled: "{{ groups['aodh_all'] is defined and groups['aodh_all'] | length > 0 }}"
-tacker_gnocchi_enabled: "{{ groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0 }}"
-
-# NOTE: these and their swift_all.yml counterpart should be moved back to all.yml once swift with tacker gets proper SSL support
-# swift_rabbitmq_telemetry_port: "{{ rabbitmq_port }}"
-# swift_rabbitmq_telemetry_use_ssl: "{{ rabbitmq_use_ssl }}"
-
-# Ensure that the package state matches the global setting
-tacker_package_state: "{{ package_state }}"
-
-# venv fetch configuration
-tacker_venv_tag: "{{ venv_tag }}"
-tacker_venv_download_url: "{{ venv_base_download_url }}/tacker-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
-
-# locations for fetching the default files from the git source
-tacker_git_config_lookup_location: "{{ openstack_repo_url }}/openstackgit/tacker"
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/user_secrets.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/user_secrets.yml
deleted file mode 100644
index 50c7c0e8..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/user_secrets.yml
+++ /dev/null
@@ -1,163 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-############################# WARNING ########################################
-# The playbooks do not currently manage changing passwords in an existing
-# environment. Changing passwords and re-running the playbooks will fail
-# and may break your OpenStack environment.
-############################# WARNING ########################################
-
-
-## Rabbitmq Options
-rabbitmq_cookie_token:
-rabbitmq_monitoring_password:
-
-## Tokens
-memcached_encryption_key:
-
-## Galera Options
-galera_root_password:
-
-## Keystone Options
-keystone_container_mysql_password:
-keystone_auth_admin_password:
-keystone_service_password:
-keystone_rabbitmq_password:
-
-## Ceilometer Options:
-ceilometer_container_db_password:
-ceilometer_service_password:
-ceilometer_telemetry_secret:
-ceilometer_rabbitmq_password:
-
-## Aodh Options:
-aodh_container_db_password:
-aodh_service_password:
-aodh_rabbitmq_password:
-
-## Cinder Options
-cinder_container_mysql_password:
-cinder_service_password:
-cinder_profiler_hmac_key:
-cinder_rabbitmq_password:
-
-## Ceph/rbd: a UUID to be used by libvirt to refer to the client.cinder user
-cinder_ceph_client_uuid:
-
-## Glance Options
-glance_container_mysql_password:
-glance_service_password:
-glance_profiler_hmac_key:
-glance_rabbitmq_password:
-
-## Gnocchi Options:
-gnocchi_container_mysql_password:
-gnocchi_service_password:
-
-## Heat Options
-heat_stack_domain_admin_password:
-heat_container_mysql_password:
-### THE HEAT AUTH KEY NEEDS TO BE 32 CHARACTERS LONG ##
-heat_auth_encryption_key:
-### THE HEAT AUTH KEY NEEDS TO BE 32 CHARACTERS LONG ##
-heat_service_password:
-heat_rabbitmq_password:
-
-## Ironic options
-ironic_rabbitmq_password:
-ironic_container_mysql_password:
-ironic_service_password:
-ironic_swift_temp_url_secret_key:
-
-## Horizon Options
-horizon_container_mysql_password:
-horizon_secret_key:
-
-## Neutron Options
-neutron_container_mysql_password:
-neutron_service_password:
-neutron_rabbitmq_password:
-neutron_ha_vrrp_auth_password:
-
-## Nova Options
-nova_container_mysql_password:
-nova_api_container_mysql_password:
-nova_metadata_proxy_secret:
-nova_service_password:
-nova_rabbitmq_password:
-nova_placement_service_password:
-nova_placement_container_mysql_password:
-
-# LXD Options for nova compute
-lxd_trust_password:
-
-## Octavia Options
-octavia_container_mysql_password:
-octavia_service_password:
-octavia_health_hmac_key:
-octavia_rabbitmq_password:
-
-## Sahara Options
-sahara_container_mysql_password:
-sahara_rabbitmq_password:
-sahara_service_password:
-
-## Swift Options:
-swift_service_password:
-swift_dispersion_password:
-### Once the swift cluster has been setup DO NOT change these hash values!
-swift_hash_path_suffix:
-swift_hash_path_prefix:
-# Swift needs a telemetry password when using ceilometer
-swift_rabbitmq_telemetry_password:
-
-## haproxy stats password
-haproxy_stats_password:
-haproxy_keepalived_authentication_password:
-
-## Magnum Options
-magnum_service_password:
-magnum_galera_password:
-magnum_rabbitmq_password:
-magnum_trustee_password:
-
-## Rally Options:
-rally_galera_password:
-
-## Trove Options
-trove_galera_password:
-trove_rabbitmq_password:
-trove_service_password:
-trove_admin_user_password:
-trove_taskmanager_rpc_encr_key:
-trove_inst_rpc_key_encr_key:
-
-## Barbican Options
-barbican_galera_password:
-barbican_rabbitmq_password:
-barbican_service_password:
-
-## Designate Options
-designate_galera_password:
-designate_rabbitmq_password:
-designate_service_password:
-
-## Molteniron Options:
-molteniron_container_mysql_password:
-
-## Tacker options
-tacker_rabbitmq_password:
-tacker_service_password:
-tacker_container_mysql_password:
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"