Merge "[WIP] Adapt XCI scenarios for Fraser"

17 files changed, 886 insertions, 813 deletions

diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/ansible-role-requirements-master.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ansible-role-requirements-master.yml
new file mode 100644
index 00000000..17d43b75
--- /dev/null
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ansible-role-requirements-master.yml
@@ -0,0 +1,231 @@
+---
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2017 Ericsson AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+# these versions are based on the osa commit e319a00aaa50ac204269a0ce3da7a7a6d517ccf2 on 2017-10-31
+# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=e319a00aaa50ac204269a0ce3da7a7a6d517ccf2
+- name: ansible-hardening
+  scm: git
+  src: https://git.openstack.org/openstack/ansible-hardening
+  version: b559afac0c4678f6205f79d0e38f39025f00ddd8
+- name: apt_package_pinning
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
+  version: 2cbbf782cc0b6bef7b1f8fb4705d1cda287b8fc0
+- name: pip_install
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-pip_install
+  version: 132c6c15e53a7c143fbad78c8eba67d8cb43a3f2
+- name: galera_client
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-galera_client
+  version: 21f1ffff97ef4d04c8470490cc238a0bc168f1f2
+- name: galera_server
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-galera_server
+  version: bc21a02e18a253c6a371f87fa6827a30290bdc5b
+- name: ceph_client
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
+  version: 4bafc9b05efbe88f63c8c94d8c93fe652b648690
+- name: haproxy_server
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
+  version: 4afbd9cfb078ac60781aa683eafb7bca1cf549d5
+- name: keepalived
+  scm: git
+  src: https://github.com/evrardjp/ansible-keepalived
+  version: b13e0840b09154a6d2470f71fea8eaa968525c5b
+- name: lxc_container_create
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
+  version: 82c1dfa68fcc0fac58f8df7d09b8de955c8f8bbd
+- name: lxc_hosts
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
+  version: cb395f12b67bff82c6dcf9d7e57cc87e48a2b619
+- name: memcached_server
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
+  version: 731c02797c417c496c05a6498e360443ca74df47
+- name: openstack_hosts
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
+  version: 7a822f2f3c7c2dcb81635f2756701bea72b4d128
+- name: os_keystone
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
+  version: 6de9abe29e67c94877ca0580ccd90aa9e45d6818
+- name: openstack_openrc
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
+  version: df34a4f181002d8242283ecb76373bbf576644c9
+- name: os_aodh
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
+  version: 8e8cbcb4ab430cc1043e303a832f0372fc6266ac
+- name: os_barbican
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
+  version: 7486c0af49becf61d0a908d49f8ed686dd4c5a14
+- name: os_ceilometer
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
+  version: 43ffd98114669025ffceccdf955a8e4da3c260a0
+- name: os_cinder
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
+  version: 4e7cb3441e38f71897e46e137e3b85bc92209ae3
+- name: os_designate
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_designate
+  version: a508c2986e479a1969f711339f2eb0d2e6f030e7
+- name: os_glance
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_glance
+  version: 45d84bf792bbabd43fc100e37f8ea29504544b1c
+- name: os_gnocchi
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
+  version: 3b8cf82e07eb50997f23f014e41fabfc8b275a11
+- name: os_heat
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_heat
+  version: 82ddbf569798b9c641f3b3eb942c9e6894261808
+- name: os_horizon
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
+  version: 9e80062a58b4960bc2374dc2cc9ba78861ef84b8
+- name: os_ironic
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
+  version: ded7f989e0bc515506301929d4ff1a867aa3e73a
+- name: os_magnum
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
+  version: ce85f2d38150f4a420cc87b348070c28788e7cb6
+- name: os_molteniron
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron
+  version: 840ac7379c7c1eadd37e043b82cbe28a1fb78c5f
+- name: os_neutron
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
+  version: a45ca094084c15321bf3b0e52c8d2b307a910ec7
+- name: os_nova
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_nova
+  version: a96e6b09ca4718f46305934c344e1ebf36765d8d
+- name: os_octavia
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_octavia
+  version: 77ff369cb37512376bb879dd8d82ef49c293d94c
+- name: os_rally
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_rally
+  version: 5e0cb6b723acd89e475f8bb86eb2c2376a3f7ebf
+- name: os_sahara
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
+  version: 2ead3c9023481a5f784d65cf19f0ffbae65cee52
+- name: os_swift
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_swift
+  version: c0e9362268690fe5f6ab6a6b8f5a45a66045bef1
+- name: os_tacker
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_tacker
+  version: 0fad7f3584969d038c4dc5c512fdd83f72aa8b6d
+- name: os_tempest
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
+  version: 5e1c5a98a8e15363d8ba5c401e81a55b4af71a5d
+- name: os_trove
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_trove
+  version: 70ff281931bef890f4d19da7fc76d7b39e9e0d5b
+- name: plugins
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-plugins
+  version: 6a64c8e7dbc1d3a6cbb444dbcdefbeb4632c01fa
+- name: rabbitmq_server
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
+  version: b68c27140654f5d34bdc0bae3cd0e5af3a4c36a7
+- name: repo_build
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-repo_build
+  version: 1237aa4e0f7de633d28797fe8ff469e314f8a509
+- name: repo_server
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-repo_server
+  version: 165a1570caaec0946a14760a52476311c32185cc
+- name: rsyslog_client
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
+  version: 3b917569cda50cbd491b3b86b4313100171962bf
+- name: rsyslog_server
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
+  version: a8d87bb4192490128e81639343a2a9e2390267d9
+- name: sshd
+  scm: git
+  src: https://github.com/willshersystems/ansible-sshd
+  version: 537b9b2bc2fd7f23301222098344727f8161993c
+- name: bird
+  scm: git
+  src: https://github.com/logan2211/ansible-bird
+  version: 5033c412398cf6f98097a9ac274a6f12810c807e
+- name: etcd
+  scm: git
+  src: https://github.com/logan2211/ansible-etcd
+  version: 3933355dfe51477822db517d3c07ad561fb61318
+- name: unbound
+  scm: git
+  src: https://github.com/logan2211/ansible-unbound
+  version: 7be67d6b60718896f0c17a7d4a14b912f72a59ae
+- name: resolvconf
+  scm: git
+  src: https://github.com/logan2211/ansible-resolvconf
+  version: d48dd3eea22094b6ecc6aa6ea07279c8e68e28b5
+- name: ceph-defaults
+  scm: git
+  src: https://github.com/ceph/ansible-ceph-defaults
+  version: 19884aaac1bc58921952af955c66602ccca89e93
+- name: ceph-common
+  scm: git
+  src: https://github.com/ceph/ansible-ceph-common
+  version: 764bde08cac495a17dd238afc7082708840fe9c9
+- name: ceph-config
+  scm: git
+  src: https://github.com/ceph/ansible-ceph-config
+  version: e070537f443c3ae5d262835c8b0a7a992850283b
+- name: ceph-mon
+  scm: git
+  src: https://github.com/ceph/ansible-ceph-mon
+  version: b026cda81101205164a523c7eca3db5e2896b13b
+- name: ceph-mgr
+  scm: git
+  src: https://github.com/ceph/ansible-ceph-mgr
+  version: fe8f0864500b54cc7c9f897b871ba2cdf1d37096
+- name: ceph-osd
+  scm: git
+  src: https://github.com/ceph/ansible-ceph-osd
+  version: f3adfac8fc50fa8095af82bb44d9f540435b400a
+- name: opendaylight
+  scm: git
+  src: https://git.opendaylight.org/gerrit/p/integration/packaging/ansible-opendaylight.git
+  version: 54aa2162cda2b6f11e95684276184e2eb96569a4
+- name: haproxy_endpoints
+  scm: git
+  src: https://github.com/logan2211/ansible-haproxy-endpoints
+  version: 49901861b16b8afaa9bccdbc649ac956610ff22b
+- name: os_tacker
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_tacker
+  version: master
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/ansible-role-requirements.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ansible-role-requirements-pike.yml
index 725a88af..3f78560e 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/ansible-role-requirements.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ansible-role-requirements-pike.yml
@@ -1,196 +1,212 @@
 - name: ansible-hardening
   scm: git
   src: https://git.openstack.org/openstack/ansible-hardening
-  version: 957c0bc39680118862a8aab66a189041827590b5
+  version: 68e99a13eb5803898e1a8153b60a21bdd2e1075b
 - name: apt_package_pinning
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
-  version: d5c0d7e8d21fc1539cc043097e23851296e2dd95
+  version: 9403a36513aee54c15890ac96c1f8c455f9c083d
 - name: pip_install
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  version: 767b923ba94df9ce067d7d782c1ea40bf423d764
+  version: 4f760bd4ebc0d8a3a8d45d6634bd0be91ff46905
 - name: galera_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
-  version: abf0fe82fdfec45d3680fbf4b13c9ba26d685e0f
+  version: 52b374547648056b58c544532296599801d501d7
 - name: galera_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-galera_server
-  version: 21aed2dde52c29cb550707658bb9a2260d076f61
+  version: 645dd258853dfc493233470ee0fbfe3c5472f0b9
 - name: ceph_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
-  version: 3cb26707ace29be5fc1be631faf26e060cfb6ea5
+  version: 197f70e7363ff073a33d1cfae71dd26b253ac3a6
 - name: haproxy_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
-  version: 749d22fc362f2453088bccc5e4975c285643d410
+  version: a905aaed8627f59d9dc10b9bc031589a7c65828f
 - name: keepalived
   scm: git
   src: https://github.com/evrardjp/ansible-keepalived
-  version: 3.0.2
+  version: 3.0.3
 - name: lxc_container_create
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
-  version: 258dad41ced7f9511d4e388470a759f46d9509fa
+  version: 6f19ef944f21cba51f0868ab090a2bd5ee345d51
 - name: lxc_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
-  version: fc561e5acef6d6aef40fff9c194252824981890e
+  version: 8730a53fa10e4bbf01c8f9731d3746f0d104384e
 - name: memcached_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
-  version: 53e845e54ebc3cabf71e6612eaef199325b1721b
+  version: 08c483f3c5d49c236194090534a015b67c8cded6
 - name: openstack_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
-  version: b3d55e49ff80eba6616b19ab6d99a2fc85aad85d
+  version: a0d3b9c9756b6e95b0e034f3d0576fbb33607820
 - name: os_keystone
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
-  version: dfb6fa3d84455f2e17b58db20e4bcf67efc014c9
+  version: 51288a1b6312e363b1188fb624c4678bf06fd18a
 - name: openstack_openrc
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
-  version: 2e4a1d87b75d816b95cdc6a4b94a36f66657d76c # 2017 5th August to get tacker
+  version: b27229ef168aed7f2febf6991b2d7459ec8883ee
 - name: os_aodh
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
-  version: aebf86ae0dafae3876a6faab7a0c55010c055f53
+  version: 2b9f1bbc77df082ebaed46afe88ffeb087f17d08
 - name: os_barbican
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
-  version: 91c62d5d2815bc53940e0048f7c9b65bd31e1a7d
+  version: 81aaca158b0329f6d9508349480a8d9c344d3cb4
 - name: os_ceilometer
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
-  version: 1d709bd6eace68bfd7fb7d1e52df8d5b6f28810b
+  version: 4b3e0589a0188de885659614ef4e076018af54f7
 - name: os_cinder
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: efda0771083f23c7869e6a52585e8382f570a800
+  version: 6f5ab34e5a0694f3fc84e63c912e00e86e3de280
+- name: os_designate
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_designate
+  version: a4952759e91853adbc2ba0e0088eacd12a0d1bd1
 - name: os_glance
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_glance
-  version: 802c3dcad5b9f578fdac969e327bfece75509ef2
+  version: 6e98bb6588ff72e2d513c71f6fda0c824c003402
 - name: os_gnocchi
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
-  version: 6c3ffedc0e523163042cf167b1077ddc11136b4c
+  version: 5f8950f61ed6b61d1cc06ab73b3b02466bee0db1
 - name: os_heat
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_heat
-  version: 87582ad58070ffb964f982749f71253e0f9148c4
+  version: 4d1efae631026631fb2af4f43a9fe8ca210d643e
 - name: os_horizon
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
-  version: e4ff13c56a38707e08cfc00b6eb377b2469fb750
+  version: f69594c93fa27a94b665b24c9196347489fec8ff
 - name: os_ironic
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
-  version: b217195f8ae7a5a39eba7d633e625b0c3b0c63b1
+  version: b857cc3e3514929f46867b051c56dd32c1f38992
 - name: os_magnum
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
-  version: dfb38385242c9e7f8c04b4485d793055f892ee17
-- name: os_trove
+  version: 0fdeea886ef4227e02d793f6dbfd54ccd9e6e088
+- name: os_molteniron
   scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_trove
-  version: 93913b6af52bbf55d224b1b0b8ce53e3a8c84398
+  src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron
+  version: 58cff32e954ab817d07b8e0a136663c34d7f7b60
 - name: os_neutron
   scm: git
-  src: https://github.com/mardim91/openstack-ansible-os_neutron
-  version: ocata-backport-automated-twentyninth-september
+  src: https://github.com/manuelbuil/openstack-ansible-os_neutron
+  version: pike-SFC-support
 - name: os_nova
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_nova
-  version: e6f2295b369b579633f89938fd48c7075ff789af
+  version: 214f20b2540a76365826f68b4ccbb28e04812c03
+- name: os_octavia
+  scm: git
+  src: https://git.openstack.org/openstack/openstack-ansible-os_octavia
+  version: 5676be3e840dd52ec9600ff0b4bb662b97ab1bb7
 - name: os_rally
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_rally
-  version: 190522159369ddfec4c8df72bb2a3da351cb841d
+  version: 53e95f8950b96a72b5f6cb5d379384b07cd26108
 - name: os_sahara
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
-  version: 4a224f899fbbb68be31824a265fabcb92aa873a4
+  version: e3e4f1bc8d72dd6fb7e26b8d0d364f9a60e16b0f
 - name: os_swift
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_swift
-  version: 0946e99dbdcde84a21d87a3876139bc31b6afbda
+  version: 65a330b0bc96fb88b7b34082f40f47e432948f34
 - name: os_tempest
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
-  version: 18dc9333cbbad6c4a22d7f9ddd4bb58fbf377a9e
+  version: dd26eb55264f125c0075315ba610a8ba6c3d5146
+- 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: b4a5996c0e163bf39e399045d372e5877339a72b
+  version: 5113c6f6394fd393dd8f86dfb69c9a2b51e0b822
 - name: rabbitmq_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
-  version: f3389273c4795b55ccc800ef1fd977fba1ba0783
+  version: fb428338e555767b2a7341b6eab0898d958569b8
 - name: repo_build
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-repo_build
-  version: a40a69f81832484e9c9deb7a13f63f0d0283611d
+  version: 03b04ab31b0858b0295c928c7869221c01b22bc8
 - name: repo_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-repo_server
-  version: 2c4a2b3ebd9ba4994b86250cf7b789ed8b09a8f6
+  version: 5928b0d6de880bfd8c4067afbc420be9166935a2
 - name: rsyslog_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
-  version: 5f5275720d13bd22945348751131c39877b731ab
+  version: f41638370114412b97c6523b4c626ca70f0337f4
 - name: rsyslog_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
-  version: a7d4b0df2e9ed3c2a1414613e96c7c9db0f2db60
+  version: 61a3ab251f63c6156f2a6604ee1a822070e19c90
 - name: sshd
   scm: git
   src: https://github.com/willshersystems/ansible-sshd
-  version: 0.4.5
+  version: 0.5.1
 - name: bird
   scm: git
   src: https://github.com/logan2211/ansible-bird
-  version: '1.2'
+  version: '1.4'
 - name: etcd
   scm: git
   src: https://github.com/logan2211/ansible-etcd
-  version: '1.2'
+  version: '1.3'
 - name: unbound
   scm: git
   src: https://github.com/logan2211/ansible-unbound
-  version: '1.3'
+  version: '1.5'
 - name: resolvconf
   scm: git
   src: https://github.com/logan2211/ansible-resolvconf
-  version: '1.2'
-- name: os_designate
+  version: '1.3'
+- name: ceph-defaults
   scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_designate
-  version: 2d1d0a75fb30b95588b943cfa3e7c830004999f4
-- name: ceph.ceph-common
+  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: v2.2.11
-- name: ceph.ceph-docker-common
+  version: v3.0.8
+- name: ceph-config
   scm: git
-  src: https://github.com/ceph/ansible-ceph-docker-common
-  version: ca86fd0ef6d24aa2c750a625acdcb8012c374aa0
+  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: v2.2.11
+  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: v2.2.11
+  version: v3.0.8
+- name: os_tacker
+  scm: git
+  src: https://github.com/manuelbuil/openstack-ansible-os_tacker
+  version: pike-suse-support
 - name: opendaylight
   scm: git
   src: https://git.opendaylight.org/gerrit/p/integration/packaging/ansible-opendaylight.git
-  version: cf095a4f71ff054f305f14ffdef7cdd7233e3d71
-- name: os_tacker
-  scm: git
-  src: git://git.openstack.org/openstack/openstack-ansible-os_tacker
-  version: 58855a0e63179ee5603035a8f607a39a4b99c2a6
+  version: 2af197bd13f77d2a07878b160c00f8ceeebb3c34
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/defaults/repo_packages/opendaylight-master.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/defaults/repo_packages/opendaylight-master.yml
new file mode 100644
index 00000000..ded0e0df
--- /dev/null
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/defaults/repo_packages/opendaylight-master.yml
@@ -0,0 +1,22 @@
+---
+# 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: b304fc9154d81e021d26327b39528ceaa3f0ac72 # HEAD of "master" as of 14.10.2017
+networking_odl_project_group: neutron_all
+
+networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc
+networking_sfc_git_install_branch: 580faa9bf1a01fd62cb9d0fe4a1c9fd0c40b50b1 # HEAD of "master" as of 14.10.2017
+networking_sfc_project_group: neutron_all
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/defaults/repo_packages/opendaylight.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/defaults/repo_packages/opendaylight-pike.yml
index 2e1a542f..d4a0b931 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/defaults/repo_packages/opendaylight.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/openstack-ansible/playbooks/defaults/repo_packages/opendaylight-pike.yml
@@ -14,9 +14,9 @@
 # limitations under the License.
 
 networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl
-networking_odl_git_install_branch: stable/ocata
+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/ocata
+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/tacker_files/all.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/all.yml
deleted file mode 100644
index 2af1ba0a..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/all.yml
+++ /dev/null
@@ -1,487 +0,0 @@
-
----
-# Copyright 2016, 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.
-
-## OpenStack Source Code Release
-openstack_release: 15.1.7
-
-## Verbosity Options
-debug: False
-
-## SSH connection wait time
-ssh_delay: 5
-
-# Set the package install state for distribution packages
-# Options are 'present' and 'latest'
-package_state: "latest"
-
-# Set "/var/log" to be a bind mount to the physical host.
-default_bind_mount_logs: true
-
-# Set distro variable
-os_distro_version: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version.split('.')[:2] | join('.') }}-{{ ansible_architecture | lower }}"
-
-# Ensure that the package state matches the global setting
-ceph_client_package_state: "{{ package_state }}"
-galera_client_package_state: "{{ package_state }}"
-pip_install_package_state: "{{ package_state }}"
-rsyslog_client_package_state: "{{ package_state }}"
-
-## OpenStack source options
-openstack_repo_url: "http://{{ internal_lb_vip_address }}:{{ repo_server_port }}"
-openstack_repo_git_url: "git://{{ internal_lb_vip_address }}"
-
-# URL for the frozen internal openstack repo.
-repo_server_port: 8181
-repo_pkg_cache_enabled: true
-repo_pkg_cache_port: 3142
-repo_pkg_cache_url: "http://{{ internal_lb_vip_address }}:{{ repo_pkg_cache_port }}"
-repo_release_path: "{{ openstack_repo_url }}/os-releases/{{ openstack_release }}/{{ os_distro_version }}"
-
-# These are pinned to ensure exactly the same behaviour forever!
-# These pins are updated through the sources-branch-updater script
-pip_packages:
-  - pip==9.0.1
-  - setuptools==33.1.1
-  - wheel==0.29.0
-
-pip_links:
-  - { name: "openstack_release", link: "{{ repo_release_path }}/" }
-pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
-
-# The upper constraints to apply to all pip installations
-pip_install_upper_constraints: "{{ repo_release_path }}/requirements_absolute_requirements.txt"
-
-# The URL to retrieve the get-pip.py installation script
-pip_upstream_url: "{{ (pip_offline_install | bool) | ternary('https://bootstrap.pypa.io/get-pip.py', repo_release_path ~ '/get-pip.py') }}"
-
-## kernel modules for specific group hosts
-# :param name: name of the kernel module
-# :param pattern: pattern to search for in /boot/config-$kernel_version to check how module is configured inside kernel
-# :param group: group of hosts where the module will be loaded
-openstack_host_specific_kernel_modules:
-  - { name: "ebtables", pattern: "CONFIG_BRIDGE_NF_EBTABLES", group: "network_hosts" }
-
-## DNS resolution (resolvconf) options
-#Group containing resolvers to configure
-resolvconf_resolver_group: unbound
-
-## Memcached options
-memcached_port: 11211
-memcached_servers: "{% for host in groups['memcached'] %}{{ hostvars[host]['ansible_host'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}"
-
-## Galera
-galera_address: "{{ internal_lb_vip_address }}"
-galera_root_user: "root"
-
-## RabbitMQ
-rabbitmq_host_group: "rabbitmq_all"
-rabbitmq_port: "{{ (rabbitmq_use_ssl | bool) | ternary(5671, 5672) }}"
-
-rabbitmq_use_ssl: True
-rabbitmq_servers: "{% for host in groups[rabbitmq_host_group] %}{{ hostvars[host]['ansible_host'] }}{% if not loop.last %},{% endif %}{% endfor %}"
-
-## Enable external SSL handling for general OpenStack services
-openstack_external_ssl: true
-
-## OpenStack global Endpoint Protos
-openstack_service_publicuri_proto: https
-#openstack_service_adminuri_proto: http
-#openstack_service_internaluri_proto: http
-
-## SSL
-# These do not need to be configured unless you're creating certificates for
-# services running behind Apache (currently, Horizon and Keystone).
-ssl_protocol: "ALL -SSLv2 -SSLv3"
-# Cipher suite string from https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/
-ssl_cipher_suite: "ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:RSA+AESGCM:RSA+AES:!aNULL:!MD5:!DSS"
-
-## Region Name
-service_region: RegionOne
-
-## OpenStack Domain
-openstack_domain: openstack.local
-lxc_container_domain: "{{ openstack_domain }}"
-
-## DHCP Domain Name
-dhcp_domain: openstacklocal
-
-## LDAP enabled toggle
-service_ldap_backend_enabled: "{{ keystone_ldap is defined and keystone_ldap.Default is defined }}"
-
-## Base venv configuration
-venv_tag: "{{ openstack_release }}"
-venv_base_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ os_distro_version }}"
-
-## Aodh
-aodh_service_region: "{{ service_region }}"
-aodh_galera_user: aodh
-aodh_galera_database: aodh
-aodh_galera_address: "{{ internal_lb_vip_address }}"
-aodh_connection_string: "mysql+pymysql://{{ aodh_galera_user }}:{{ aodh_container_db_password }}@{{ aodh_galera_address }}/{{ aodh_galera_database }}?charset=utf8"
-aodh_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
-
-
-## Ceilometer
-ceilometer_service_user_name: ceilometer
-ceilometer_service_tenant_name: service
-
-# These are here rather than in ceilometer_all because
-# both the os_ceilometer and os_swift roles require them
-ceilometer_rabbitmq_userid: ceilometer
-ceilometer_rabbitmq_vhost: /ceilometer
-ceilometer_rabbitmq_port: "{{ rabbitmq_port }}"
-ceilometer_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-ceilometer_rabbitmq_servers: "{{ rabbitmq_servers }}"
-ceilometer_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
-
-
-## Cinder
-cinder_service_region: "{{ service_region }}"
-cinder_service_port: 8776
-# If there are Swift hosts in the environment, then enable cinder backups to it
-cinder_service_backup_program_enabled: "{{ groups['swift_all'] is defined and groups['swift_all'] | length > 0 }}"
-cinder_ceph_client: cinder
-
-# These are here rather than in cinder_all because
-# both the os_ceilometer and os_cinder roles require them
-
-# RPC
-cinder_rabbitmq_userid: cinder
-cinder_rabbitmq_vhost: /cinder
-cinder_rabbitmq_port: "{{ rabbitmq_port }}"
-cinder_rabbitmq_servers: "{{ rabbitmq_servers }}"
-cinder_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-cinder_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
-
-# Telemetry notifications
-cinder_rabbitmq_telemetry_userid: "{{ cinder_rabbitmq_userid }}"
-cinder_rabbitmq_telemetry_password: "{{ cinder_rabbitmq_password }}"
-cinder_rabbitmq_telemetry_vhost: "{{ cinder_rabbitmq_vhost }}"
-cinder_rabbitmq_telemetry_port: "{{ cinder_rabbitmq_port }}"
-cinder_rabbitmq_telemetry_servers: "{{ cinder_rabbitmq_servers }}"
-cinder_rabbitmq_telemetry_use_ssl: "{{ cinder_rabbitmq_use_ssl }}"
-cinder_rabbitmq_telemetry_host_group: "{{ cinder_rabbitmq_host_group }}"
-
-# If there are any Ceilometer hosts in the environment, then enable its usage
-cinder_ceilometer_enabled: "{{ (groups['cinder_all'] is defined) and (groups['cinder_all'] | length > 0) and (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-
-## Glance
-glance_service_port: 9292
-glance_service_proto: http
-glance_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(glance_service_proto) }}"
-glance_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(glance_service_proto) }}"
-glance_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(glance_service_proto) }}"
-glance_service_publicuri: "{{ glance_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ glance_service_port }}"
-glance_service_publicurl: "{{ glance_service_publicuri }}"
-glance_service_internaluri: "{{ glance_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ glance_service_port }}"
-glance_service_internalurl: "{{ glance_service_internaluri }}"
-glance_service_adminuri: "{{ glance_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ glance_service_port }}"
-glance_service_adminurl: "{{ glance_service_adminuri }}"
-glance_api_servers: "{{ glance_service_internaluri }}"
-glance_service_user_name: glance
-
-# These are here rather than in glance_all because
-# both the os_ceilometer and os_glance roles require them
-
-## Gnocchi
-# Used in both Gnocchi and Swift roles.
-gnocchi_service_project_name: "{{ (gnocchi_storage_driver is defined and gnocchi_storage_driver == 'swift') | ternary('gnocchi_swift', 'service') }}"
-
-# RPC
-glance_rabbitmq_userid: glance
-glance_rabbitmq_vhost: /glance
-glance_rabbitmq_port: "{{ rabbitmq_port }}"
-glance_rabbitmq_servers: "{{ rabbitmq_servers }}"
-glance_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-glance_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
-
-# Telemetry notifications
-glance_rabbitmq_telemetry_userid: "{{ glance_rabbitmq_userid }}"
-glance_rabbitmq_telemetry_password: "{{ glance_rabbitmq_password }}"
-glance_rabbitmq_telemetry_vhost: "{{ glance_rabbitmq_vhost }}"
-glance_rabbitmq_telemetry_port: "{{ glance_rabbitmq_port }}"
-glance_rabbitmq_telemetry_servers: "{{ glance_rabbitmq_servers }}"
-glance_rabbitmq_telemetry_use_ssl: "{{ glance_rabbitmq_use_ssl }}"
-glance_rabbitmq_telemetry_host_group: "{{ glance_rabbitmq_host_group }}"
-
-# If there are any Ceilometer hosts in the environment, then enable its usage
-glance_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-
-## Heat
-
-# These are here rather than in heat_all because
-# both the os_ceilometer and os_heat roles require them
-
-# RPC
-heat_rabbitmq_userid: heat
-heat_rabbitmq_vhost: /heat
-heat_rabbitmq_port: "{{ rabbitmq_port }}"
-heat_rabbitmq_servers: "{{ rabbitmq_servers }}"
-heat_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-heat_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
-
-# Telemetry notifications
-heat_rabbitmq_telemetry_userid: "{{ heat_rabbitmq_userid }}"
-heat_rabbitmq_telemetry_password: "{{ heat_rabbitmq_password }}"
-heat_rabbitmq_telemetry_vhost: "{{ heat_rabbitmq_vhost }}"
-heat_rabbitmq_telemetry_port: "{{ heat_rabbitmq_port }}"
-heat_rabbitmq_telemetry_servers: "{{ heat_rabbitmq_servers }}"
-heat_rabbitmq_telemetry_use_ssl: "{{ heat_rabbitmq_use_ssl }}"
-heat_rabbitmq_telemetry_host_group: "{{ heat_rabbitmq_host_group }}"
-
-# If there are any Ceilometer hosts in the environment, then enable its usage
-heat_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-
-## Ironic
-ironic_keystone_auth_plugin: password
-ironic_rabbitmq_userid: ironic
-ironic_rabbitmq_vhost: /ironic
-ironic_rabbitmq_port: "{{ rabbitmq_port }}"
-ironic_rabbitmq_servers: "{{ rabbitmq_servers }}"
-ironic_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-ironic_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
-ironic_service_name: ironic
-ironic_service_user_name: ironic
-ironic_service_proto: http
-ironic_service_port: 6385
-ironic_service_project_name: service
-ironic_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(ironic_service_proto) }}"
-ironic_service_adminurl: "{{ ironic_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ ironic_service_port }}"
-
-## Keystone
-keystone_admin_user_name: admin
-keystone_admin_tenant_name: admin
-keystone_admin_port: 35357
-keystone_service_port: 5000
-keystone_service_proto: http
-keystone_service_region: "{{ service_region }}"
-
-# These are here rather than in keystone_all because
-# both the os_ceilometer and os_keystone roles require them
-
-# RPC
-keystone_rabbitmq_userid: keystone
-keystone_rabbitmq_vhost: /keystone
-keystone_rabbitmq_port: "{{ rabbitmq_port }}"
-keystone_rabbitmq_servers: "{{ rabbitmq_servers }}"
-keystone_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-keystone_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
-
-# Telemetry notifications
-keystone_rabbitmq_telemetry_userid: "{{ keystone_rabbitmq_userid }}"
-keystone_rabbitmq_telemetry_password: "{{ keystone_rabbitmq_password }}"
-keystone_rabbitmq_telemetry_vhost: "{{ keystone_rabbitmq_vhost }}"
-keystone_rabbitmq_telemetry_port: "{{ keystone_rabbitmq_port }}"
-keystone_rabbitmq_telemetry_servers: "{{ keystone_rabbitmq_servers }}"
-keystone_rabbitmq_telemetry_use_ssl: "{{ keystone_rabbitmq_use_ssl }}"
-keystone_rabbitmq_telemetry_host_group: "{{ keystone_rabbitmq_host_group }}"
-
-# If there are any Ceilometer hosts in the environment, then enable its usage
-keystone_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-
-keystone_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(keystone_service_proto) }}"
-keystone_service_adminuri_insecure: "{% if keystone_service_adminuri_proto == 'https' and (keystone_user_ssl_cert is not defined or haproxy_user_ssl_cert is not defined) | bool %}true{% else %}false{% endif %}"
-keystone_service_adminuri: "{{ keystone_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ keystone_admin_port }}"
-keystone_service_adminurl: "{{ keystone_service_adminuri }}/v3"
-
-keystone_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(keystone_service_proto) }}"
-keystone_service_internaluri_insecure: "{% if keystone_service_internaluri_proto == 'https' and (keystone_user_ssl_cert is not defined or haproxy_user_ssl_cert is not defined) | bool %}true{% else %}false{% endif %}"
-keystone_service_internaluri: "{{ keystone_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ keystone_service_port }}"
-keystone_service_internalurl: "{{ keystone_service_internaluri }}/v3"
-
-## Neutron
-neutron_service_port: 9696
-neutron_service_proto: http
-neutron_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(neutron_service_proto) }}"
-neutron_service_adminuri: "{{ neutron_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ neutron_service_port }}"
-neutron_service_adminurl: "{{ neutron_service_adminuri }}"
-neutron_service_user_name: neutron
-neutron_service_project_name: service
-neutron_service_region: "{{ service_region }}"
-
-# These are here rather than in neutron_all because
-# both the os_ceilometer and os_neutron roles require them
-
-# RPC
-neutron_rabbitmq_userid: neutron
-neutron_rabbitmq_vhost: /neutron
-neutron_rabbitmq_port: "{{ rabbitmq_port }}"
-neutron_rabbitmq_servers: "{{ rabbitmq_servers }}"
-neutron_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-neutron_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
-
-# Telemetry notifications
-neutron_rabbitmq_telemetry_userid: "{{ neutron_rabbitmq_userid }}"
-neutron_rabbitmq_telemetry_password: "{{ neutron_rabbitmq_password }}"
-neutron_rabbitmq_telemetry_vhost: "{{ neutron_rabbitmq_vhost }}"
-neutron_rabbitmq_telemetry_port: "{{ neutron_rabbitmq_port }}"
-neutron_rabbitmq_telemetry_servers: "{{ neutron_rabbitmq_servers }}"
-neutron_rabbitmq_telemetry_use_ssl: "{{ neutron_rabbitmq_use_ssl }}"
-neutron_rabbitmq_telemetry_host_group: "{{ neutron_rabbitmq_host_group }}"
-
-# If there are any Designate hosts in the environment, then enable its usage
-neutron_designate_enabled: "{{ (groups['designate_all'] is defined) and (groups['designate_all'] | length > 0) }}"
-# If there are any Ceilometer hosts in the environment, then enable its usage
-neutron_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-
-neutron_plugin_type: ml2.lxb
-
-## Nova
-nova_service_port: 8774
-nova_metadata_port: 8775
-nova_service_proto: http
-nova_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(nova_service_proto) }}"
-nova_service_adminuri: "{{ nova_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ nova_service_port }}"
-nova_service_adminurl: "{{ nova_service_adminuri }}/v2.1/%(tenant_id)s"
-nova_service_region: "{{ service_region }}"
-nova_service_user_name: nova
-nova_service_project_name: service
-nova_service_project_domain_id: default
-nova_service_user_domain_id: default
-nova_keystone_auth_plugin: password
-nova_console_type: spice
-nova_novncproxy_port: 6080
-nova_spice_html5proxy_base_port: 6082
-nova_console_port: "{% if nova_console_type == 'spice' %}{{ nova_spice_html5proxy_base_port }}{% else %}{{ nova_novncproxy_port }}{% endif %}"
-
-# These are here rather than in nova_all because
-# both the os_ceilometer and os_nova roles require them
-
-# RPC
-nova_rabbitmq_userid: nova
-nova_rabbitmq_vhost: /nova
-nova_rabbitmq_port: "{{ rabbitmq_port }}"
-nova_rabbitmq_servers: "{{ rabbitmq_servers }}"
-nova_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-nova_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
-
-# Telemetry notifications
-nova_rabbitmq_telemetry_userid: "{{ nova_rabbitmq_userid }}"
-nova_rabbitmq_telemetry_password: "{{ nova_rabbitmq_password }}"
-nova_rabbitmq_telemetry_vhost: "{{ nova_rabbitmq_vhost }}"
-nova_rabbitmq_telemetry_port: "{{ nova_rabbitmq_port }}"
-nova_rabbitmq_telemetry_servers: "{{ nova_rabbitmq_servers }}"
-nova_rabbitmq_telemetry_use_ssl: "{{ nova_rabbitmq_use_ssl }}"
-nova_rabbitmq_telemetry_host_group: "{{ nova_rabbitmq_host_group }}"
-
-# If there are any Designate hosts in the environment, then enable its usage
-nova_designate_enabled: "{{ (groups['designate_all'] is defined) and (groups['designate_all'] | length > 0) }}"
-# If there are any Ceilometer hosts in the environment, then enable its usage
-nova_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
-# If there are any Barbican hosts in the environment, then enable its usage
-nova_barbican_enabled: "{{ (groups['barbican_all'] is defined) and (groups['barbican_all'] | length > 0) }}"
-
-## Sahara
-#RPC
-sahara_rabbitmq_userid: sahara
-sahara_rabbitmq_vhost: /sahara
-sahara_rabbitmq_port: "{{ rabbitmq_port }}"
-sahara_rabbitmq_servers: "{{ rabbitmq_servers }}"
-sahara_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
-sahara_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
-
-# Telemetry notifications
-sahara_rabbitmq_telemetry_userid: "{{ sahara_rabbitmq_userid }}"
-sahara_rabbitmq_telemetry_password: "{{ sahara_rabbitmq_password }}"
-sahara_rabbitmq_telemetry_vhost: "{{ sahara_rabbitmq_vhost }}"
-sahara_rabbitmq_telemetry_port: "{{ sahara_rabbitmq_port }}"
-sahara_rabbitmq_telemetry_servers: "{{ sahara_rabbitmq_servers }}"
-sahara_rabbitmq_telemetry_use_ssl: "{{ sahara_rabbitmq_use_ssl }}"
-sahara_rabbitmq_telemetry_host_group: "{{ sahara_rabbitmq_host_group }}"
-
-# If there are any Ceilometer and Sahara hosts in the environment, then enable its usage
-sahara_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['sahara_all'] is defined) and (groups['ceilometer_all'] | length > 0) and (groups['sahara_all'] | length > 0) }}"
-
-## Swift
-swift_proxy_port: 8080
-swift_system_user_name: swift
-swift_system_shell: /bin/bash
-swift_system_comment: swift system user
-swift_system_home_folder: "/var/lib/{{ swift_system_user_name }}"
-
-# Swift Telemetry notifications
-swift_rabbitmq_telemetry_userid: "swift"
-swift_rabbitmq_telemetry_vhost: "/swift"
-swift_rabbitmq_telemetry_servers: "{{ rabbitmq_servers }}"
-swift_rabbitmq_telemetry_host_group: "{{ rabbitmq_host_group }}"
-
-# If there are any Ceilometer and Swift hosts in the environment, then enable its usage
-swift_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['swift_proxy'] is defined) and (groups['ceilometer_all'] | length > 0) and (groups['swift_proxy'] | length > 0) }}"
-
-## OpenStack Openrc
-openrc_os_auth_url: "{{ keystone_service_internalurl }}"
-openrc_os_password: "{{ keystone_auth_admin_password }}"
-openrc_os_domain_name: "Default"
-openrc_region_name: "{{ service_region }}"
-
-## Host security hardening
-# The openstack-ansible-security role provides security hardening for hosts
-# by applying security configurations from the STIG. Hardening is enabled by
-# default, but an option to opt out is available by setting the following
-# variable to 'false'.
-# Docs: http://docs.openstack.org/developer/openstack-ansible-security/
-apply_security_hardening: true
-
-## Ansible ssh configuration
-ansible_ssh_extra_args: >
-  -o UserKnownHostsFile=/dev/null
-  -o StrictHostKeyChecking=no
-  -o ServerAliveInterval=64
-  -o ServerAliveCountMax=1024
-  -o Compression=no
-  -o TCPKeepAlive=yes
-  -o VerifyHostKeyDNS=no
-  -o ForwardX11=no
-  -o ForwardAgent=yes
-  -T
-
-# Toggle whether the service is deployed in a container or not
-is_metal: "{{ properties.is_metal | default(false) }}"
-
-## ceph-ansible configuration
-mon_group_name: ceph-mon
-osd_group_name: ceph-osd
-ceph_stable: true
-# The _stable_release var is used by both the OSA ceph_client role and the
-# ceph-ansible roles. It is defaulted in ceph_client but set here to keep the
-# OSA/ceph-ansible integrations in sync.
-ceph_stable_release: jewel
-fetch_directory: /etc/openstack_deploy/ceph-fetch/
-# tries to create /var/log/ceph as a directory and fails if the log link already
-# exists. we handle the log dir creation so this is not something we need
-# ceph-common to prepare for us.
-rbd_client_directories: false
-
-# Magnum
-magnum_bind_port: 9511
-magnum_service_proto: http
-magnum_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(magnum_service_proto) }}"
-magnum_service_publicurl: "{{ magnum_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ magnum_bind_port }}"
-magnum_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(magnum_service_proto) }}"
-magnum_service_internalurl: "{{ magnum_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ magnum_bind_port }}"
-magnum_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(magnum_service_proto) }}"
-magnum_service_adminurl: "{{ magnum_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ magnum_bind_port }}"
-
-# 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 }}"
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
new file mode 100644
index 00000000..0d6b15ec
--- /dev/null
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/all_tacker.yml
@@ -0,0 +1,14 @@
+# 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
index 386a63e3..49b58360 100644
--- 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
@@ -1,3 +1,17 @@
+# 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
@@ -111,7 +125,7 @@ haproxy_default_services:
       haproxy_ssl: "{{ haproxy_ssl }}"
       haproxy_balance_type: http
       haproxy_backend_options:
-        - "httpchk HEAD /"
+        - "httpchk GET /"
   - service:
       haproxy_service_name: nova_api_metadata
       haproxy_backend_nodes: "{{ groups['nova_api_metadata'] | default([]) }}"
@@ -137,6 +151,8 @@ haproxy_default_services:
       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([]) }}"
@@ -189,14 +205,6 @@ haproxy_default_services:
       haproxy_backend_options:
         - "httpchk /healthcheck"
   - service:
-      haproxy_service_name: ceilometer_api
-      haproxy_backend_nodes: "{{ groups['ceilometer_api_container'] | default([]) }}"
-      haproxy_ssl: "{{ haproxy_ssl }}"
-      haproxy_port: 8777
-      haproxy_balance_type: tcp
-      haproxy_backend_options:
-        - tcp-check
-  - service:
       haproxy_service_name: aodh_api
       haproxy_backend_nodes: "{{ groups['aodh_api'] | default([]) }}"
       haproxy_ssl: "{{ haproxy_ssl }}"
@@ -246,9 +254,7 @@ haproxy_default_services:
       haproxy_port: 9311
       haproxy_balance_type: http
       haproxy_backend_options:
-        - "httpchk HEAD /"
-      haproxy_backend_httpcheck_options:
-        - "expect status 401"
+        - "httpchk GET /"
   - service:
       haproxy_service_name: designate_api
       haproxy_backend_nodes: "{{ groups['designate_api'] | default([]) }}"
@@ -260,6 +266,15 @@ haproxy_default_services:
         - "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
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/openstack_services.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/openstack_services.yml
deleted file mode 100644
index 8cecf968..00000000
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/openstack_services.yml
+++ /dev/null
@@ -1,238 +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: 0651044b20227dad1d8247be47614a2447c21793 # HEAD of "stable/ocata" as of 25.08.2017
-requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}"
-
-
-## Aodh service
-aodh_git_repo: https://git.openstack.org/openstack/aodh
-aodh_git_install_branch: ab45afcfe9a531127ab6f06a128ec5db9cfe7a06 # HEAD of "stable/ocata" as of 25.08.2017
-aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}"
-aodh_git_project_group: aodh_all
-
-
-## Barbican service
-barbican_git_repo: https://git.openstack.org/openstack/barbican
-barbican_git_install_branch: 67abd259f56a5f991455a68dd9fe321985e195be # HEAD of "stable/ocata" as of 25.08.2017
-barbican_git_dest: "/opt/barbican_{{ barbican_git_install_branch | replace('/', '_') }}"
-barbican_git_project_group: barbican_all
-
-
-## Ceilometer service
-ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
-ceilometer_git_install_branch: c154befc4226183d0856533583342e004df3bda7 # HEAD of "stable/ocata" as of 25.08.2017
-ceilometer_git_dest: "/opt/ceilometer_{{ceilometer_git_install_branch | replace('/', '_') }}"
-ceilometer_git_project_group: ceilometer_all
-
-
-## Cinder service
-cinder_git_repo: https://git.openstack.org/openstack/cinder
-cinder_git_install_branch: 78d093b864e46dc847e507342c7b1f7d01233fea # HEAD of "stable/ocata" as of 25.08.2017
-cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}"
-cinder_git_project_group: cinder_all
-
-
-## Designate service
-designate_git_repo: https://git.openstack.org/openstack/designate
-designate_git_install_branch: b0b2878b3c356d057f9e2468d55dc0cd8f42ec42 # HEAD of "stable/ocata" as of 25.08.2017
-designate_git_dest: "/opt/designate_{{ designate_git_install_branch | replace('/', '_') }}"
-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: 02819244c054577656ac4db745b7bf6f47c26b9d # HEAD of "stable/ocata" as of 25.08.2017
-designate_dashboard_git_dest: "/opt/designate_dashboard_{{ designate_dashboard_git_install_branch | replace('/', '_') }}"
-designate_dashboard_git_project_group: horizon_all
-
-
-## Dragonflow service
-dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow
-dragonflow_git_install_branch: b72ffa06721faf95f42c9702f60a9acc3a7d8b61 # HEAD of "stable/ocata" as of 25.08.2017
-dragonflow_git_dest: "/opt/dragonflow_{{ dragonflow_git_install_branch | replace('/', '_') }}"
-dragonflow_git_project_group: neutron_all
-
-
-## Glance service
-glance_git_repo: https://git.openstack.org/openstack/glance
-glance_git_install_branch: 0a2074ecef67beb7a3b3531534c9d97b1c3ea828 # HEAD of "stable/ocata" as of 25.08.2017
-glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}"
-glance_git_project_group: glance_all
-
-
-## Heat service
-heat_git_repo: https://git.openstack.org/openstack/heat
-heat_git_install_branch: 1e57d98611b661795d2977d00405385dec609dba # HEAD of "stable/ocata" as of 25.08.2017
-heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}"
-heat_git_project_group: heat_all
-
-
-## Horizon service
-horizon_git_repo: https://git.openstack.org/openstack/horizon
-horizon_git_install_branch: d4f4c17a7f3ca3ee3c9b9e0dbdc8412b256a5f78 # HEAD of "stable/ocata" as of 25.08.2017
-horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}"
-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: 93b9054d21a8ee6c270f648383828959818734c1 # HEAD of "stable/ocata" as of 25.08.2017
-ironic_dashboard_git_dest: "/opt/ironic_dashboard_{{ ironic_dashboard_git_install_branch | replace('/', '_') }}"
-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: 369d3e0bf9bb562c28bb975736694b598109310a # HEAD of "stable/ocata" as of 25.08.2017
-magnum_dashboard_git_dest: "/opt/magnum_dashboard_{{ magnum_dashboard_git_install_branch | replace('/', '_') }}"
-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: 834ea9dd7aeaefed397d6d510b7527ce0fa5bd33 # HEAD of "stable/ocata" as of 25.08.2017
-neutron_lbaas_dashboard_git_dest: "/opt/neutron_lbaas_dashboard_{{ neutron_lbaas_dashboard_git_install_branch | replace('/', '_') }}"
-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: 655b666d760e1e2f005c9711a21dadb11b459e97 # HEAD of "stable/ocata" as of 25.08.2017
-sahara_dashboard_git_dest: "/opt/sahara_dashboard_{{ sahara_dashboard_git_install_branch | replace('/', '_') }}"
-sahara_dashboard_git_project_group: horizon_all
-
-
-## Keystone service
-keystone_git_repo: https://git.openstack.org/openstack/keystone
-keystone_git_install_branch: 16d8f0d11f0ab9678b7e99f063fcce23d32c3c3b # HEAD of "stable/ocata" as of 25.08.2017
-keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}"
-keystone_git_project_group: keystone_all
-
-
-## Neutron service
-neutron_git_repo: https://git.openstack.org/openstack/neutron
-neutron_git_install_branch: fbd60b0991af7a02ebd958f86000dabd59e221b0 # HEAD of "stable/ocata" as of 25.08.2017
-neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}"
-neutron_git_project_group: neutron_all
-
-neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
-neutron_lbaas_git_install_branch: b3479a1a2652bb45fbdc0b78da9a4a65c6ee9a0e # HEAD of "stable/ocata" as of 25.08.2017
-neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}"
-neutron_lbaas_git_project_group: neutron_all
-
-neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
-neutron_vpnaas_git_install_branch: 6fece0ee069c5dd036b4712cfd74855844aa7f91 # HEAD of "stable/ocata" as of 25.08.2017
-neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}"
-neutron_vpnaas_git_project_group: neutron_all
-
-neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
-neutron_fwaas_git_install_branch: 1f76429d87327e1d1d70a7a0211098c76f9f4688 # HEAD of "stable/ocata" as of 25.08.2017
-neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}"
-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: 4b6afd41961743353400f78ddcbc4a5d34665468 # HEAD of "stable/ocata" as of 25.08.2017
-neutron_dynamic_routing_git_dest: "/opt/neutron_dynamic_routing_{{ neutron_dynamic_routing_git_install_branch | replace('/', '_') }}"
-neutron_dynamic_routing_git_project_group: neutron_all
-
-networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
-networking_calico_git_install_branch: e794848060e7ab3edf320b1847151de4eb6af142 # HEAD of "master" as of 29.06.2017
-networking_calico_git_project_group: neutron_all
-
-## Nova service
-nova_git_repo: https://git.openstack.org/openstack/nova
-nova_git_install_branch: bcf110fe7ca2d989a956303313f413614e7a6548 # HEAD of "stable/ocata" as of 25.08.2017
-nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}"
-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: a7df8c69b1a3cafbcbccd2a0010b1d21351ba01b # HEAD of "stable/ocata" as of 25.08.2017
-nova_powervm_git_dest: "/opt/nova_powervm_{{ nova_powervm_git_install_branch | replace('/', '_') }}"
-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: 2a452c54ea6cf525e2ef9ff1e29776d2ab618311 # HEAD of "stable/ocata" as of 25.08.2017
-nova_lxd_git_dest: "/opt/nova_lxd_{{ nova_lxd_git_install_branch | replace('/', '_') }}"
-nova_lxd_git_project_group: nova_all
-
-
-## Sahara service
-sahara_git_repo: https://git.openstack.org/openstack/sahara
-sahara_git_install_branch: 4a17aa318b12c93d228cafdd95c892681744b91d # HEAD of "stable/ocata" as of 25.08.2017
-sahara_git_dest: "/opt/sahara_{{ sahara_git_install_branch | replace('/', '_') }}"
-sahara_git_project_group: sahara_all
-
-
-## Swift service
-swift_git_repo: https://git.openstack.org/openstack/swift
-swift_git_install_branch: 72ed8f23a78f11e1ca1688ba086590bb7062a8c7 # HEAD of "stable/ocata" as of 25.08.2017
-swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"
-swift_git_project_group: swift_all
-
-
-## Swift3 middleware
-swift_swift3_git_repo: https://git.openstack.org/openstack/swift3
-swift_swift3_git_install_branch: a8bbdd66464b735a247159ee6c68e0d71bcf27d6 # HEAD of "master" as of 30.06.2017
-swift_swift3_git_project_group: swift_all
-
-
-## Ironic service
-ironic_git_repo: https://git.openstack.org/openstack/ironic
-ironic_git_install_branch: ac7b8067db9b4b8d9cd9d87767e6760f3af6e1e7 # HEAD of "stable/ocata" as of 25.08.2017
-ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}"
-ironic_git_project_group: ironic_all
-
-## Magnum service
-magnum_git_repo: https://git.openstack.org/openstack/magnum
-magnum_git_install_branch: a422f534101ff9f733dd65d9c1a6e7f8a2003693 # HEAD of "stable/ocata" as of 25.08.2017
-magnum_git_dest: "/opt/magnum_{{ magnum_git_install_branch | replace('/', '_') }}"
-magnum_git_project_group: magnum_all
-
-## Trove service
-trove_git_repo: https://git.openstack.org/openstack/trove
-trove_git_install_branch: 898d364fdf2cb6faad9735cdd01cba16b67f19b7 # HEAD of "stable/ocata" as of 25.08.2017
-trove_git_dest: "/opt/trove_{{ trove_git_install_branch | replace('/', '_') }}"
-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: e88344200a0b3e03f644a98723ff5fa1b670df7a # HEAD of "stable/ocata" as of 25.08.2017
-trove_dashboard_git_dest: "/opt/trove_dashboard_{{ trove_dashboard_git_install_branch | replace('/', '_') }}"
-trove_dashboard_git_project_group: horizon_all
-
-## Tacker service
-tacker_git_repo: https://github.com/manuelbuil/tacker
-tacker_git_install_branch: ocata-insecured-bug-fixed
-tacker_git_project_group: tacker_all
-
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/openstack_services_master.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/openstack_services_master.yml
new file mode 100644
index 00000000..7f305ca6
--- /dev/null
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/openstack_services_master.yml
@@ -0,0 +1,222 @@
+---
+# 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: 6d9fe55d3697d46c8e10de829ebbdc8bcddf0111 # HEAD of "master" as of 14.10.2017
+
+
+## Aodh service
+aodh_git_repo: https://git.openstack.org/openstack/aodh
+aodh_git_install_branch: 348ec72208d9fc883eb93ae1b36bd501fe401cbc # HEAD of "master" as of 14.10.2017
+aodh_git_project_group: aodh_all
+
+
+## Barbican service
+barbican_git_repo: https://git.openstack.org/openstack/barbican
+barbican_git_install_branch: d2ab56c61c0dc215dfbd078d00f4cabceaa2cdd7 # HEAD of "master" as of 14.10.2017
+barbican_git_project_group: barbican_all
+
+
+## Ceilometer service
+ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
+ceilometer_git_install_branch: ecfdcc42a98efddc62838d3f6823a1cd5ff94cac # HEAD of "master" as of 14.10.2017
+ceilometer_git_project_group: ceilometer_all
+
+
+## Cinder service
+cinder_git_repo: https://git.openstack.org/openstack/cinder
+cinder_git_install_branch: 625cf70f9690afa34ea717a7b3417890971e4c4a # HEAD of "master" as of 17.10.2017
+cinder_git_project_group: cinder_all
+
+
+## Designate service
+designate_git_repo: https://git.openstack.org/openstack/designate
+designate_git_install_branch: 284cdabe1e82934b05e20fda26423702c2628918 # HEAD of "master" as of 14.10.2017
+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: 6213e7534f2c197bd2c577bd183d0bd53bf89857 # HEAD of "master" as of 14.10.2017
+designate_dashboard_git_project_group: horizon_all
+
+
+## Dragonflow service
+dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow
+dragonflow_git_install_branch: 84f1a26ff8e976b753593dc445e09a4c1a675a21 # HEAD of "master" as of 14.10.2017
+dragonflow_git_project_group: neutron_all
+
+
+## Glance service
+glance_git_repo: https://git.openstack.org/openstack/glance
+glance_git_install_branch: 7f9853122252c38ecc536ea523bc8e3094c3adda # HEAD of "master" as of 14.10.2017
+glance_git_project_group: glance_all
+
+
+## Heat service
+heat_git_repo: https://git.openstack.org/openstack/heat
+heat_git_install_branch: c5593161d9bcbddde69e38d9136ccb93367b51f8 # HEAD of "master" as of 14.10.2017
+heat_git_project_group: heat_all
+
+
+## Horizon service
+horizon_git_repo: https://git.openstack.org/openstack/horizon
+horizon_git_install_branch: 80643ca53f7db43eac496829290983126616ea4b # HEAD of "master" as of 14.10.2017
+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: 70933196786a780d690b11af9995b37942f28e3b # HEAD of "master" as of 14.10.2017
+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: 02c2d06bdaebc892d37d5b51fc0555a5469bf017 # HEAD of "master" as of 14.10.2017
+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: 80a2f0f5c82acb58833c43e158afd974e555f92b # HEAD of "master" as of 14.10.2017
+neutron_lbaas_dashboard_git_project_group: horizon_all
+
+## Horizon FWaaS dashboard plugin
+neutron_fwaas_dashboard_git_repo: https://git.openstack.org//openstack/neutron-fwaas-dashboard
+neutron_fwaas_dashboard_git_install_branch: 58cdd72b1398ad7a4d4dcdba2ca9fe37fe9f63f8 # HEAD of "master" as of 14.10.2017
+neutron_fwaas_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: b8ccdf99971293a388b99d781b70fa0e0fb69d40 # HEAD of "master" as of 14.10.2017
+sahara_dashboard_git_project_group: horizon_all
+
+
+## Keystone service
+keystone_git_repo: https://git.openstack.org/openstack/keystone
+keystone_git_install_branch: 47dbd256258d747d95cb5320bd02ae207ecf60d6 # HEAD of "master" as of 14.10.2017
+keystone_git_project_group: keystone_all
+
+
+## Neutron service
+neutron_git_repo: https://git.openstack.org/openstack/neutron
+neutron_git_install_branch: 62b788192014705ae1c31bed05fd5f6dbba9a2d9 # HEAD of "master" as of 14.10.2017
+neutron_git_project_group: neutron_all
+
+neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
+neutron_lbaas_git_install_branch: a5294c1d1149bf3bcb3321937c9223f18b49ed7a # HEAD of "master" as of 14.10.2017
+neutron_lbaas_git_project_group: neutron_all
+
+neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
+neutron_vpnaas_git_install_branch: e3da5c10c472ece03828b076a9240b735295a42e # HEAD of "master" as of 14.10.2017
+neutron_vpnaas_git_project_group: neutron_all
+
+neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
+neutron_fwaas_git_install_branch: 43f7ae3493a9e6333f3b9d533271a757de036736 # HEAD of "master" as of 14.10.2017
+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: 95d2bdfde10ba9622014620738d15e8c5bff0bb4 # HEAD of "master" as of 14.10.2017
+neutron_dynamic_routing_git_project_group: neutron_all
+
+networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
+networking_calico_git_install_branch: 9688df1a3d1d8b3fd9ba367e82fe6b0559416728 # HEAD of "master" as of 14.10.2017
+networking_calico_git_project_group: neutron_all
+
+## Nova service
+nova_git_repo: https://git.openstack.org/openstack/nova
+nova_git_install_branch: c7832f7d9e60a18e95f3cfeef76d55989fbad803 # HEAD of "master" as of 14.10.2017
+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: a58458507433d970b53e338df199dc8251812c23 # HEAD of "master" as of 14.10.2017
+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: aaa8b602150623a81432eb8fbad26c2d4d9b42b6 # HEAD of "master" as of 14.10.2017
+nova_lxd_git_project_group: nova_all
+
+
+## Sahara service
+sahara_git_repo: https://git.openstack.org/openstack/sahara
+sahara_git_install_branch: cf4cf40eab5a485abb6052b4a9d263be4625dc4e # HEAD of "master" as of 14.10.2017
+sahara_git_project_group: sahara_all
+
+
+## Swift service
+swift_git_repo: https://git.openstack.org/openstack/swift
+swift_git_install_branch: 98e7014aafbd52bd5e388314f3c2c1e1d2375806 # HEAD of "master" as of 14.10.2017
+swift_git_project_group: swift_all
+
+
+## Swift3 middleware
+swift_swift3_git_repo: https://git.openstack.org/openstack/swift3
+swift_swift3_git_install_branch: 1fb6a30ee59a16cd4b6c49bab963ff9e3f974580 # HEAD of "master" as of 14.10.2017
+swift_swift3_git_project_group: swift_all
+
+
+## Ironic service
+ironic_git_repo: https://git.openstack.org/openstack/ironic
+ironic_git_install_branch: 2d486ca8c0b1ed9251a76945457e0fc28239e7ac # HEAD of "master" as of 14.10.2017
+ironic_git_project_group: ironic_all
+
+## Magnum service
+magnum_git_repo: https://git.openstack.org/openstack/magnum
+magnum_git_install_branch: 4b88f7b78010299148fa8878e963c15fe5d5f525 # HEAD of "master" as of 14.10.2017
+magnum_git_project_group: magnum_all
+
+## Trove service
+trove_git_repo: https://git.openstack.org/openstack/trove
+trove_git_install_branch: f6c3c27a49d5cf1c84eec441923f9f4d8c12f3d2 # HEAD of "master" as of 14.10.2017
+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: b4ebbbab63501793839d519f35d6d381f0334ca8 # HEAD of "master" as of 14.10.2017
+trove_dashboard_git_project_group: horizon_all
+
+## Octavia service
+octavia_git_repo: https://git.openstack.org/openstack/octavia
+octavia_git_install_branch: 859bb3bae35fb26e3305d4ee691b4d5eba99d1ff # HEAD of "master" as of 14.10.2017
+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 14.10.2017
+molteniron_git_project_group: molteniron_all
+
+## Tacker service
+tacker_git_repo: https://git.openstack.org/openstack/tacker
+tacker_git_install_branch: 9ca9cf28cec8ae70a7795f7267ddd9909f5e307a # HEAD of "master" as of 14.10.2017
+tacker_git_project_group: tacker_all
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
new file mode 100644
index 00000000..cecd7db1
--- /dev/null
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/openstack_services_pike.yml
@@ -0,0 +1,217 @@
+---
+# 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: 732861162db604622ac23ad65c070e3f69d0b44e # HEAD of "stable/pike" as of 10.11.2017
+
+
+## Aodh service
+aodh_git_repo: https://git.openstack.org/openstack/aodh
+aodh_git_install_branch: ed3ce41fa0ae0173601b683748265e502b84553b # HEAD of "stable/pike" as of 10.11.2017
+aodh_git_project_group: aodh_all
+
+
+## Barbican service
+barbican_git_repo: https://git.openstack.org/openstack/barbican
+barbican_git_install_branch: ec47f0358a17fde8fa1253253e21af07f72b7fa3 # HEAD of "stable/pike" as of 10.11.2017
+barbican_git_project_group: barbican_all
+
+
+## Ceilometer service
+ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
+ceilometer_git_install_branch: 8f10d547a4c4eeac0af2a5c833881dbe48c26464 # HEAD of "stable/pike" as of 10.11.2017
+ceilometer_git_project_group: ceilometer_all
+
+
+## Cinder service
+cinder_git_repo: https://git.openstack.org/openstack/cinder
+cinder_git_install_branch: 34928801b06e1162895a64c4e95c2f2692303a50 # HEAD of "stable/pike" as of 10.11.2017
+cinder_git_project_group: cinder_all
+
+
+## Designate service
+designate_git_repo: https://git.openstack.org/openstack/designate
+designate_git_install_branch: 6beba54a71510525d5bbc4956d20d27bffa982e5 # HEAD of "stable/pike" as of 10.11.2017
+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 10.11.2017
+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: 06af2eb5abe0332f7035a7d7c2fbfd19fbc4dae7 # HEAD of "stable/pike" as of 10.11.2017
+glance_git_project_group: glance_all
+
+
+## Heat service
+heat_git_repo: https://git.openstack.org/openstack/heat
+heat_git_install_branch: 31175a5641035abeec58c3f135ad09d3f231ac41 # HEAD of "stable/pike" as of 10.11.2017
+heat_git_project_group: heat_all
+
+
+## Horizon service
+horizon_git_repo: https://git.openstack.org/openstack/horizon
+horizon_git_install_branch: 246ff9f81248a00a434e66d18fad70519ba811cc # HEAD of "stable/pike" as of 10.11.2017
+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: e2cba8ed8745b8ffcaa60d26ab69fd93f61582ad # HEAD of "stable/pike" as of 10.11.2017
+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 10.11.2017
+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: a5a05a27e7cab99dc379774f1d01c0076818e539 # HEAD of "stable/pike" as of 10.11.2017
+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: 00c241d97bd3a116513580cfe8006480723d7c17 # HEAD of "stable/pike" as of 10.11.2017
+sahara_dashboard_git_project_group: horizon_all
+
+
+## Keystone service
+keystone_git_repo: https://git.openstack.org/openstack/keystone
+keystone_git_install_branch: d07677aba54362a4a3aa2d165b155105ffe30d73 # HEAD of "stable/pike" as of 10.11.2017
+keystone_git_project_group: keystone_all
+
+
+## Neutron service
+neutron_git_repo: https://git.openstack.org/openstack/neutron
+neutron_git_install_branch: bd64409bbb9465143ea6df9db4d53a7679599b69 # HEAD of "stable/pike" as of 10.11.2017
+neutron_git_project_group: neutron_all
+
+neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
+neutron_lbaas_git_install_branch: f0b6a85877ba9c31c41fc6c8b96ffd2b63e6afb9 # HEAD of "stable/pike" as of 10.11.2017
+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 10.11.2017
+neutron_vpnaas_git_project_group: neutron_all
+
+neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
+neutron_fwaas_git_install_branch: c2bafa999f7ea45687d5a3d42739e465564e99d1 # HEAD of "stable/pike" as of 10.11.2017
+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 10.11.2017
+neutron_dynamic_routing_git_project_group: neutron_all
+
+networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
+networking_calico_git_install_branch: 9688df1a3d1d8b3fd9ba367e82fe6b0559416728 # HEAD of "master" as of 10.11.2017
+networking_calico_git_project_group: neutron_all
+
+## Nova service
+nova_git_repo: https://git.openstack.org/openstack/nova
+nova_git_install_branch: 8fdb1372138f8371a4d414deb38b86e9197b8649 # HEAD of "stable/pike" as of 10.11.2017
+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 10.11.2017
+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 10.11.2017
+nova_lxd_git_project_group: nova_all
+
+
+## Sahara service
+sahara_git_repo: https://git.openstack.org/openstack/sahara
+sahara_git_install_branch: 3ee0da5ea09904125c44e1f9d1a9b83554b1a1cd # HEAD of "stable/pike" as of 10.11.2017
+sahara_git_project_group: sahara_all
+
+
+## Swift service
+swift_git_repo: https://git.openstack.org/openstack/swift
+swift_git_install_branch: 0344d6eb5afc723adc7bacf4b4e2aaf04da47548 # HEAD of "stable/pike" as of 10.11.2017
+swift_git_project_group: swift_all
+
+
+## Swift3 middleware
+swift_swift3_git_repo: https://git.openstack.org/openstack/swift3
+swift_swift3_git_install_branch: 1fb6a30ee59a16cd4b6c49bab963ff9e3f974580 # HEAD of "master" as of 10.11.2017
+swift_swift3_git_project_group: swift_all
+
+
+## Ironic service
+ironic_git_repo: https://git.openstack.org/openstack/ironic
+ironic_git_install_branch: c163e78629eac4e696ae62dc9a29a0fc77ca463f # HEAD of "stable/pike" as of 10.11.2017
+ironic_git_project_group: ironic_all
+
+## Magnum service
+magnum_git_repo: https://git.openstack.org/openstack/magnum
+magnum_git_install_branch: 839884593e6f6dabaebe401b013465c836fefc84 # HEAD of "stable/pike" as of 10.11.2017
+magnum_git_project_group: magnum_all
+
+## Trove service
+trove_git_repo: https://git.openstack.org/openstack/trove
+trove_git_install_branch: e6d4b4b3fe1768348c9df815940b97cecb5e7ee2 # HEAD of "stable/pike" as of 10.11.2017
+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: 387c3358555ee539f7abbbf4875497497e12c265 # HEAD of "stable/pike" as of 10.11.2017
+trove_dashboard_git_project_group: horizon_all
+
+## Octavia service
+octavia_git_repo: https://git.openstack.org/openstack/octavia
+octavia_git_install_branch: 534e1f932cff19e6a54e256c56b7e3479755760d # HEAD of "stable/pike" as of 10.11.2017
+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 10.11.2017
+molteniron_git_project_group: molteniron_all
+
+## Tacker service
+tacker_git_repo: https://github.com/manuelbuil/tacker
+tacker_git_install_branch: pike-insecured-bug-fixed
+tacker_git_project_group: tacker_all
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
index 456a8add..94bb5291 100644
--- 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
@@ -14,12 +14,32 @@
 # 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_all.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/tacker_files/tacker_all.yml
index 4016aa11..2a01a160 100644
--- 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
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-tacker_service_publicuri: "{{ openstack_service_publicuri_proto|default(tacker_service_proto) }}://{{ external_lb_vip_address }}:{{ tacker_service_port }}"
-tacker_service_adminurl: "{{ tacker_service_adminuri }}/"
 tacker_service_region: "{{ service_region }}"
 tacker_service_in_ldap: "{{ service_ldap_backend_enabled }}"
 
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
new file mode 100644
index 00000000..9e1f6809
--- /dev/null
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-master.yml
@@ -0,0 +1,16 @@
+---
+
+- 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"
+
+- 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 and OVS-NSH 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/add-sfc-repos-and-inventory.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-pike.yml
index 1a70c388..3396b83e 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/add-sfc-repos-and-inventory-pike.yml
@@ -2,7 +2,7 @@
 
 - name: Add networking-odl and networking-sfc repos
   copy:
-    src: openstack-ansible/playbooks/defaults/repo_packages/opendaylight.yml
+    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
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
new file mode 100644
index 00000000..cc291ef4
--- /dev/null
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-master.yml
@@ -0,0 +1,17 @@
+---
+#
+
+- name: copy user_sfc_scenarios_variables.yml
+  copy:
+    src: "{{XCI_FLAVOR}}/user_sfc_scenarios_variables.yml"
+    dest: "{{OPENSTACK_OSA_ETC_PATH}}/user_sfc_scenarios_variables.yml"
+
+- 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"
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml
index 5915ba1c..16e07005 100644
--- a/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files.yml
+++ b/scenarios/os-odl-sfc/role/os-odl-sfc/tasks/copy-OSA-files-pike.yml
@@ -8,7 +8,7 @@
 
 - name: copy OPNFV role requirements
   copy:
-    src: "ansible-role-requirements.yml"
+    src: "ansible-role-requirements-pike.yml"
     dest: "{{OPENSTACK_OSA_PATH}}/ansible-role-requirements.yml"
 
 - name: copy openstack_user_config.yml
@@ -29,22 +29,22 @@
 - name: copy haproxy_config.yml for tacker
   copy:
     src: "tacker_files/haproxy_config.yml"
-    dest: "{{OPENSTACK_OSA_PATH}}/playbooks/vars/configs/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.yml"
+    src: "tacker_files/openstack_services_pike.yml"
     dest: "{{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/openstack_services.yml"
 
-- name: copy all.yml with tacker stuff
+- name: copy all/tacker.yml
   copy:
-    src: "tacker_files/all.yml"
-    dest: "{{OPENSTACK_OSA_PATH}}/playbooks/inventory/group_vars/all.yml"
+    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}}/playbooks/inventory/group_vars/tacker_all.yml"
+    dest: "{{OPENSTACK_OSA_PATH}}/group_vars/tacker_all.yml"
 
 - name: copy setup-openstack.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 f1fdcf2a..819ef203 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,8 +8,18 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-- name: Add SFC repos and inventory
-  include: add-sfc-repos-and-inventory.yml
+- 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
-  include: copy-OSA-files.yml
+- 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"
+
+- name: Copy the OSA not-yet-upstreamed files for master
+  include: copy-OSA-files-master.yml
+  when: OPENSTACK_OSA_VERSION != "stable/pike"