16 files changed, 270 insertions, 114 deletions
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions
index 1e392132..03537258 100755
--- a/xci/config/pinned-versions
+++ b/xci/config/pinned-versions
@@ -27,5 +27,5 @@
 export OPNFV_RELENG_VERSION="master"
 # HEAD of bifrost "master" as of 29.06.2017
 export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"db9f2f556bf92558275c0422beafb5e68eff59f1"}
-# HEAD of osa "master" as of 05.09.2017
-export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"d32bb257cbad2410711d6cdf54faff828605026e"}
+# HEAD of osa "master" as of 02.11.2017
+export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"e319a00aaa50ac204269a0ce3da7a7a6d517ccf2"}
diff --git a/xci/file/aio/configure-opnfvhost.yml b/xci/file/aio/configure-opnfvhost.yml
index 41ae0b3b..6b140c15 100644
--- a/xci/file/aio/configure-opnfvhost.yml
+++ b/xci/file/aio/configure-opnfvhost.yml
@@ -6,6 +6,14 @@
   roles:
     - { role: clone-repository, project: "openstack/openstack-ansible", repo: "{{ OPENSTACK_OSA_GIT_URL }}", dest: "{{ OPENSTACK_OSA_PATH }}", version: "{{ OPENSTACK_OSA_VERSION }}" }
   tasks:
+    - name: Synchronize local development openstack-ansible repository to XCI paths
+      synchronize:
+        src: "{{ OPENSTACK_OSA_DEV_PATH }}"
+        dest: "{{ OPENSTACK_OSA_PATH }}"
+        recursive: yes
+        delete: yes
+      when:
+        - OPENSTACK_OSA_DEV_PATH != ""
     - name: bootstrap ansible on opnfv host
       command: "/bin/bash ./scripts/bootstrap-ansible.sh"
       args:
diff --git a/xci/file/ansible-role-requirements.yml b/xci/file/ansible-role-requirements.yml
index 4cbce18b..27eef6f5 100644
--- a/xci/file/ansible-role-requirements.yml
+++ b/xci/file/ansible-role-requirements.yml
@@ -7,209 +7,221 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-# these versions are based on the osa commit d32bb257cbad2410711d6cdf54faff828605026e on 2017-09-04
-# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=d32bb257cbad2410711d6cdf54faff828605026e
+# 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: 9c210008340c1b1de8aa15b8ddb355ebfa23d91f
+  version: b559afac0c4678f6205f79d0e38f39025f00ddd8
 - name: apt_package_pinning
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
-  version: 008d51d3705dbe126c6d92ce0d46791982b36b5f
+  version: 2cbbf782cc0b6bef7b1f8fb4705d1cda287b8fc0
 - name: pip_install
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  version: e9e1b3ad078bb23a678d3a0684bbf6cf90b78b8f
+  version: 132c6c15e53a7c143fbad78c8eba67d8cb43a3f2
 - name: galera_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
-  version: 83a34e0ca9d184f871e04f64f8e7258135a0b18d
+  version: 21f1ffff97ef4d04c8470490cc238a0bc168f1f2
 - name: galera_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-galera_server
-  version: 42edfdbede2ae3120721b919c40e3e3c2baba57a
+  version: bc21a02e18a253c6a371f87fa6827a30290bdc5b
 - name: ceph_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
-  version: b245cd369499aec524cf5e928bf5fe6a6a077101
+  version: 4bafc9b05efbe88f63c8c94d8c93fe652b648690
 - name: haproxy_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
-  version: 4d58ac19b0958bb77b2bb07dc3d20977c0dcb3ac
+  version: 4afbd9cfb078ac60781aa683eafb7bca1cf549d5
 - name: keepalived
   scm: git
   src: https://github.com/evrardjp/ansible-keepalived
-  version: 3.0.3
+  version: b13e0840b09154a6d2470f71fea8eaa968525c5b
 - name: lxc_container_create
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
-  version: c39125aefedcc4abf7cbc99a73569eb9f39365cd
+  version: 82c1dfa68fcc0fac58f8df7d09b8de955c8f8bbd
 - name: lxc_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
-  version: 77c86130b21dd9f3e66b6829f9974076f25ff88b
+  version: cb395f12b67bff82c6dcf9d7e57cc87e48a2b619
 - name: memcached_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
-  version: e1e11b48e3b24d17b47468c572c8e934fa490a3b
+  version: 731c02797c417c496c05a6498e360443ca74df47
 - name: openstack_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
-  version: f0e080700015620e56354b284b4b410f700d333c
+  version: 7a822f2f3c7c2dcb81635f2756701bea72b4d128
 - name: os_keystone
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
-  version: 77ab88cc3e7260784f8722e71f7eb9212fa47ee8
+  version: 6de9abe29e67c94877ca0580ccd90aa9e45d6818
 - name: openstack_openrc
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
-  version: 24764c59e154e15cc49bb0061b58fff3de999b51
+  version: df34a4f181002d8242283ecb76373bbf576644c9
 - name: os_aodh
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
-  version: 3d8f5086ee4cf48e83223841f663e8b421f5fce6
+  version: 8e8cbcb4ab430cc1043e303a832f0372fc6266ac
 - name: os_barbican
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
-  version: f8a4919d15950c2bc43ac099a3eb0272e6123ea0
+  version: 7486c0af49becf61d0a908d49f8ed686dd4c5a14
 - name: os_ceilometer
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
-  version: b6066809239513f82cb45719f09c15f24050d9bb
+  version: 43ffd98114669025ffceccdf955a8e4da3c260a0
 - name: os_cinder
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: 384e1ba690a9b65a9d7ebf77d9fbb8579f39dc5a
+  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: c474697d6d6724ed5d8f0690032982f7dcea73fc
+  version: 45d84bf792bbabd43fc100e37f8ea29504544b1c
 - name: os_gnocchi
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
-  version: 37226686a46cc0bc7728036bb85d7de69a175b87
+  version: 3b8cf82e07eb50997f23f014e41fabfc8b275a11
 - name: os_heat
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_heat
-  version: 2392d899eef60a8ea10bfecb6c0a1b6b026ea453
+  version: 82ddbf569798b9c641f3b3eb942c9e6894261808
 - name: os_horizon
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
-  version: e2124ba4c5b7b1ff9461732d3240f6e2efcabbeb
+  version: 9e80062a58b4960bc2374dc2cc9ba78861ef84b8
 - name: os_ironic
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
-  version: 322d35196e3313dd3695b6183bf8179d5db21b50
+  version: ded7f989e0bc515506301929d4ff1a867aa3e73a
 - name: os_magnum
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
-  version: 4a24432b20002221252c84d2faa4ad8cf847c178
-- name: os_trove
+  version: ce85f2d38150f4a420cc87b348070c28788e7cb6
+- name: os_molteniron
   scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_trove
-  version: 8f536f4f625d60c09e8bcac97f4c83951d96b97e
+  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: 779de61c7df8d298638fa86ace59526d5c900f0e
+  version: a45ca094084c15321bf3b0e52c8d2b307a910ec7
 - name: os_nova
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_nova
-  version: 648142d56f26d6d911a0c6124268b9c117e16442
+  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: 8a872872bb73919efa0ebcce8f01386d0df47f52
+  version: 5e0cb6b723acd89e475f8bb86eb2c2376a3f7ebf
 - name: os_sahara
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
-  version: 2eef75dc1efce77d78d59662583be69e00bc933f
+  version: 2ead3c9023481a5f784d65cf19f0ffbae65cee52
 - name: os_swift
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_swift
-  version: 729277d43603fc3cb7732e0fc64204e63b6a3b86
+  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: f0ada3c53f0fad1ef79e898798fe7314717e3db9
+  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: d0fe4a62dadce3d63f78f1bee511a5c6a061a1d8
+  version: 6a64c8e7dbc1d3a6cbb444dbcdefbeb4632c01fa
 - name: rabbitmq_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
-  version: 2888b2ce1a5b7fa1a15e76bed9189902f36d7d27
+  version: b68c27140654f5d34bdc0bae3cd0e5af3a4c36a7
 - name: repo_build
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-repo_build
-  version: 51ede219bca41200457aef46788117e57ebcc011
+  version: 1237aa4e0f7de633d28797fe8ff469e314f8a509
 - name: repo_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-repo_server
-  version: f12ec750fdc795f58eb8d17fa2254635ffebaa92
+  version: 165a1570caaec0946a14760a52476311c32185cc
 - name: rsyslog_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
-  version: 8bd2daa67312a456dd35eb53071d1f09e9c83785
+  version: 3b917569cda50cbd491b3b86b4313100171962bf
 - name: rsyslog_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
-  version: 2d8d8d86090277bd8f0606904f72b1d13cdb2ca5
+  version: a8d87bb4192490128e81639343a2a9e2390267d9
 - name: sshd
   scm: git
   src: https://github.com/willshersystems/ansible-sshd
-  version: 0.5.1
+  version: 537b9b2bc2fd7f23301222098344727f8161993c
 - name: bird
   scm: git
   src: https://github.com/logan2211/ansible-bird
-  version: '1.5'
+  version: 5033c412398cf6f98097a9ac274a6f12810c807e
 - name: etcd
   scm: git
   src: https://github.com/logan2211/ansible-etcd
-  version: '1.3'
+  version: 3933355dfe51477822db517d3c07ad561fb61318
 - name: unbound
   scm: git
   src: https://github.com/logan2211/ansible-unbound
-  version: '1.6'
+  version: 7be67d6b60718896f0c17a7d4a14b912f72a59ae
 - name: resolvconf
   scm: git
   src: https://github.com/logan2211/ansible-resolvconf
-  version: '1.4'
-- name: os_designate
+  version: d48dd3eea22094b6ecc6aa6ea07279c8e68e28b5
+- name: ceph-defaults
   scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_designate
-  version: 207f87ed1b7227a7b3149763da56a9e5088892ae
-- name: ceph.ceph-common
+  src: https://github.com/ceph/ansible-ceph-defaults
+  version: 19884aaac1bc58921952af955c66602ccca89e93
+- name: ceph-common
   scm: git
   src: https://github.com/ceph/ansible-ceph-common
-  version: v2.2.9
-- name: ceph.ceph-docker-common
+  version: 764bde08cac495a17dd238afc7082708840fe9c9
+- name: ceph-config
   scm: git
-  src: https://github.com/ceph/ansible-ceph-docker-common
-  version: v2.2.9
+  src: https://github.com/ceph/ansible-ceph-config
+  version: e070537f443c3ae5d262835c8b0a7a992850283b
 - name: ceph-mon
   scm: git
   src: https://github.com/ceph/ansible-ceph-mon
-  version: v2.2.9
+  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: v2.2.9
-- name: os_octavia
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_octavia
-  version: b614100c23b0bdf90f3e7c19b0aa61cc3198115c
-- name: os_molteniron
-  scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron
-  version: 9cb1df5706fd53e6c221aa7a73971bdcbfc02f66
+  version: f3adfac8fc50fa8095af82bb44d9f540435b400a
 - name: opendaylight
   scm: git
   src: https://git.opendaylight.org/gerrit/p/integration/packaging/ansible-opendaylight.git
-  version: cf095a4f71ff054f305f14ffdef7cdd7233e3d71
-- name: os_tacker
+  version: 54aa2162cda2b6f11e95684276184e2eb96569a4
+- name: haproxy_endpoints
   scm: git
-  src: https://git.openstack.org/openstack/openstack-ansible-os_tacker
-  version: 4f282e363ffa43eee15af1637aefc559f943b920
+  src: https://github.com/logan2211/ansible-haproxy-endpoints
+  version: 49901861b16b8afaa9bccdbc649ac956610ff22b
diff --git a/xci/file/global-requirement-pins.txt b/xci/file/global-requirement-pins.txt
index 4c078d0a..aa3b1169 100644
--- a/xci/file/global-requirement-pins.txt
+++ b/xci/file/global-requirement-pins.txt
@@ -10,5 +10,5 @@
 ### These pins are updated through the sources-branch-updater script ###
 ###
 pip==9.0.1
-setuptools==33.1.1
-wheel==0.29.0
+setuptools==36.6.0
+wheel==0.30.0
diff --git a/xci/file/ha/user_variables.yml b/xci/file/ha/user_variables.yml
index 8235f6f7..72960a01 100644
--- a/xci/file/ha/user_variables.yml
+++ b/xci/file/ha/user_variables.yml
@@ -21,6 +21,9 @@
 # # Debug and Verbose options.
 debug: false
 
+# Allow root logins
+security_sshd_permit_root_login: yes
+
 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
diff --git a/xci/file/install-ansible.sh b/xci/file/install-ansible.sh
index bc7bd1e4..2661eea1 100644
--- a/xci/file/install-ansible.sh
+++ b/xci/file/install-ansible.sh
@@ -79,7 +79,7 @@ case ${ID,,} in
         [wget]=wget
         [openssl]=openssl
     )
-    sudo yum update --assumeno
+    sudo yum updateinfo
     EXTRA_PKG_DEPS=()
    ;;
 
diff --git a/xci/file/mini/user_variables.yml b/xci/file/mini/user_variables.yml
index 0b8c6cd7..9ec9e405 100644
--- a/xci/file/mini/user_variables.yml
+++ b/xci/file/mini/user_variables.yml
@@ -21,6 +21,9 @@
 # # Debug and Verbose options.
 debug: false
 
+# Allow root logins
+security_sshd_permit_root_login: yes
+
 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
diff --git a/xci/file/noha/user_variables.yml b/xci/file/noha/user_variables.yml
index 72a8ab7d..66573428 100644
--- a/xci/file/noha/user_variables.yml
+++ b/xci/file/noha/user_variables.yml
@@ -21,6 +21,9 @@
 # # Debug and Verbose options.
 debug: false
 
+# Allow root logins
+security_sshd_permit_root_login: yes
+
 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
diff --git a/xci/file/openstack_services.yml b/xci/file/openstack_services.yml
index 47cf4fff..7f305ca6 100644
--- a/xci/file/openstack_services.yml
+++ b/xci/file/openstack_services.yml
@@ -31,187 +31,192 @@
 
 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: f55adf137d516406df83d4188b004b778a9035ce # HEAD of "master" as of 25.08.2017
+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: fb1678627caba6f0c2af7c42a84408c240d28b08 # HEAD of "master" as of 25.08.2017
+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: 912a6b58e544bd8517933377ac24ed411b6fc40a # HEAD of "master" as of 25.08.2017
+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: 2644fc0e0e04bb3222a12a676e34b88e30d8b4ab # HEAD of "master" as of 25.08.2017
+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: 7c7b95780a2224e21b84a43a09cb7fdcde103a92 # HEAD of "master" as of 25.08.2017
+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: e85f89a3a72b3efde921bff71af36400e5855704 # HEAD of "master" as of 25.08.2017
+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: 347e443f5abbe99a20e8f963e1d966f4a81b283b # HEAD of "master" as of 25.08.2017
+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: 418763eebf3b57ef472328bdabdee39053dc9a24 # HEAD of "master" as of 25.08.2017
+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: 715101623fbfc2a23de73f8b9ba483dabe85e110 # HEAD of "master" as of 25.08.2017
+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: da45940245951ecbf172ab53450b76d159602b5e # HEAD of "master" as of 25.08.2017
+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: 7640903b2b5c91c00bbac1a9aeef6d893f7f14eb # HEAD of "master" as of 25.08.2017
+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: 791eecc71e8e9a5a6c56896d1acb2ae9caf2491f # HEAD of "master" as of 25.08.2017
+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: 31ed768f8838803c43c4e6f6d28f770738454544 # HEAD of "master" as of 25.08.2017
+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: af2e607338fb904f562b3c7ef3d2643d2f7526ba # HEAD of "master" as of 25.08.2017
+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: fc2b57b1217805f1cd50e3f6d555b709b9b8028a # HEAD of "master" as of 25.08.2017
+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: 2373cfbbf9508a7320e306943b4b420db137bab6 # HEAD of "master" as of 25.08.2017
+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: bd4bae90a54a99b54596a4cd1f7de305cf671711 # HEAD of "master" as of 25.08.2017
+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: 7a7079964468c16b95946367eb969f7ce00ea7c0 # HEAD of "master" as of 25.08.2017
+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: 8a279b7231fe05548aa67d53ed38cf6bc47dbaad # HEAD of "master" as of 25.08.2017
+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: 43cab7462edf020a1db2f2f14f637587592d6cce # HEAD of "master" as of 25.08.2017
+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: 173bcfb8caf2bc9441006f2f4979e9d0cbc0c546 # HEAD of "master" as of 25.08.2017
+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: e794848060e7ab3edf320b1847151de4eb6af142 # HEAD of "master" as of 25.08.2017
+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: a99e936ff14c3993df1b3168cf2cdb28dcbe49b2 # HEAD of "master" as of 25.08.2017
+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: b1e053f4ef0eee28acdf01c0476efafa9a57cd34 # HEAD of "master" as of 25.08.2017
+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: e968708f664f9e955cf0c67883f783b92c96f6c7 # HEAD of "master" as of 25.08.2017
+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: 1f7c5db057df420634d78b6d7e7fcab3ffbc3b46 # HEAD of "master" as of 25.08.2017
+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: 87340e5f29905defbbc76ff17ae3db94befcbfe0 # HEAD of "master" as of 25.08.2017
+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: b4c2590ade19475458e24dabc2729ed3bbb22242 # HEAD of "master" as of 25.08.2017
+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: bb33d6ed49ee573ad8c83edff52181496ebc23d9 # HEAD of "master" as of 25.08.2017
+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: 5f84cf8fbb0fe5dc7759d43cafac30ad6d79fa7d # HEAD of "master" as of 25.08.2017
+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: 0fb67d459baa0fb22391b1b1da3dba5349666bb7 # HEAD of "master" as of 25.08.2017
+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: 387c3358555ee539f7abbbf4875497497e12c265 # HEAD of "master" as of 25.08.2017
+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: 6c1d424776695a9f83036024cfd459c9a3e25b99 # HEAD of "master" as of 25.08.2017
+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 25.08.2017
+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: 54175b3f18f631f21fb1cb929712823bb3e2b05e # HEAD of "master" as of 25.08.2017
+tacker_git_install_branch: 9ca9cf28cec8ae70a7795f7267ddd9909f5e307a # HEAD of "master" as of 14.10.2017
 tacker_git_project_group: tacker_all
diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml
new file mode 100644
index 00000000..ee9b2baf
--- /dev/null
+++ b/xci/opnfv-scenario-requirements.yml
@@ -0,0 +1,18 @@
+---
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2017 SUSE LINUX GmbH 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
+##############################################################################
+#
+# OPNFV scenarios participating in XCI must create their own entry in this file so
+# XCI can make use of them.
+#
+- scenario: os-odl-sfc
+  scm: git
+  src: https://gerrit.opnfv.org/gerrit/sfc
+  version: master
+  role: scenarios/os-odl-sfc/role/os-odl-sfc
diff --git a/xci/playbooks/bootstrap-scenarios.yml b/xci/playbooks/bootstrap-scenarios.yml
new file mode 100644
index 00000000..e7bd7dc9
--- /dev/null
+++ b/xci/playbooks/bootstrap-scenarios.yml
@@ -0,0 +1,10 @@
+---
+#
+# This file is aimed to be used by scenarios to plug into the XCI.
+# Ideally, all they need to do at this point is to include their
+# role using a statement like the following one
+#
+# - name: Include foobar role
+#   include_role:
+#     name: "foobar"
+#   when: OPNFV_SCENARIO == "foobar"
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml
index 9b12584f..9a1ac7cf 100644
--- a/xci/playbooks/configure-opnfvhost.yml
+++ b/xci/playbooks/configure-opnfvhost.yml
@@ -106,6 +106,7 @@
       shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/openstack_services.yml {{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/openstack_services.yml"
       when:
         - OPENSTACK_OSA_VERSION != "master"
+    - include: bootstrap-scenarios.yml
     - name: bootstrap ansible on opnfv host
       command: "/bin/bash ./scripts/bootstrap-ansible.sh"
       args:
diff --git a/xci/playbooks/get-opnfv-scenario-requirements.yml b/xci/playbooks/get-opnfv-scenario-requirements.yml
new file mode 100644
index 00000000..23aa1d41
--- /dev/null
+++ b/xci/playbooks/get-opnfv-scenario-requirements.yml
@@ -0,0 +1,61 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+# 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: Clone the scenario requirements
+  hosts: localhost
+  connection: local
+  gather_facts: true
+  tasks:
+    - name: Remove target directory
+      file:
+        path: "{{ item.path | default(scenario_path_default) + '/' + item.scenario }}"
+        state: absent
+      when:
+        - item.scm == "git" or item.scm is undefined
+      with_items: "{{ scenarios }}"
+
+    - name: Clone git repos (with git)
+      git:
+        repo: "{{ item.src }}"
+        dest: "{{ item.path | default(scenario_path_default) }}/{{ item.scenario | default(item.src | basename) }}"
+        version: "{{ item.version | default('master') }}"
+        refspec: "{{ item.refspec | default(omit) }}"
+        update: true
+        force: true
+      when:
+        - item.scm == "git" or item.scm is undefined
+      with_items: "{{ scenarios }}"
+      register: git_clone
+      until: git_clone | success
+      retries: "{{ git_clone_retries }}"
+      delay: "{{ git_clone_retry_delay }}"
+
+    - name: Plug in the roles to XCI
+      file:
+        state: link
+        src: "{{ item.path | default(scenario_path_default) }}/{{ item.scenario | default(item.src | basename) }}/{{ item.role }}"
+        dest: "{{ role_path_default }}/{{ item.scenario }}"
+        force: yes
+      with_items: "{{ scenarios }}"
+
+  vars:
+    ansible_python_interpreter: "/usr/bin/python"
+    scenarios: "{{ lookup('file', scenario_file) | from_yaml }}"
+    scenario_file: '../opnfv-scenario-requirements.yml'
+    scenario_path_default: "{{ lookup('env', 'XCI_PATH') }}/.cache/repos/scenarios"
+    role_path_default: "{{ playbook_dir }}/roles"
+    git_clone_retries: 2
+    git_clone_retry_delay: 5
diff --git a/xci/playbooks/roles/.gitignore b/xci/playbooks/roles/.gitignore
new file mode 100644
index 00000000..e0b47770
--- /dev/null
+++ b/xci/playbooks/roles/.gitignore
@@ -0,0 +1,8 @@
+*
+!.gitignore
+!clone-repository/
+!configure-network/
+!configure-nfs/
+!prepare-functest/
+!remote-folders/
+!synchronize-time/
diff --git a/xci/scripts/update-osa-version-files.sh b/xci/scripts/update-osa-version-files.sh
index bb28f9d3..edd09da4 100755
--- a/xci/scripts/update-osa-version-files.sh
+++ b/xci/scripts/update-osa-version-files.sh
@@ -78,14 +78,19 @@ sed -i -e "/^export OPENSTACK_OSA_VERSION/s@:-\"[a-z0-9]*@:-\"${1}@" \
     sed -i -e "/^export OPENSTACK_BIFROST_VERSION/s@:-\"[a-z0-9]*@:-\"${2}@" \
     -e "s/\(^# HEAD of bifrost.*of \).*/\1$(date +%d\.%m\.%Y)/" $releng_xci_base/config/pinned-versions
 
+cp $tempdir/openstack-ansible/playbooks/defaults/repo_packages/openstack_services.yml ${releng_xci_base}/file/.
+cp $tempdir/openstack-ansible/global-requirement-pins.txt ${releng_xci_base}/file/.
+
 popd &> /dev/null
 
 printme ""
 printme "======================= Report ============================"
 printme ""
-printme "The $releng_xci_base/file/ansible-role-requirements.yml and"
-printme "$releng_xci_base/config/pinned-versions files have been"
-printme "updated. Please make sure you test the end result before"
-printme "committing it!"
+printme "The following files have been updated:"
+printme "- $releng_xci_base/file/ansible-role-requirements.yml"
+printme "- $releng_xci_base/file/global-requirement-pins.txt"
+printme "- $releng_xci_base/file/openstack_services.yml"
+printme "- $releng_xci_base/config/pinned-versions"
+printme "Please make sure you test the end result before committing it!"
 printme ""
 printme "==========================================================="
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index d73cf5cd..7d29945a 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -50,7 +50,7 @@ fi
 #   override any of them.
 #-------------------------------------------------------------------------------
 # find where are we
-XCI_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+export XCI_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # source user vars
 source $XCI_PATH/config/user-vars
 # source pinned versions
@@ -128,6 +128,25 @@ fi
 
 # TODO: The xci playbooks can be put into a playbook which will be done later.
 
+# Clone OPNFV scenario repositories
+#-------------------------------------------------------------------------------
+# This playbook
+# - removes existing scenario roles
+# - clones OPNFV scenario roles based on the file/opnfv-scenario-requirements.yml file
+#-------------------------------------------------------------------------------
+echo "Info: Cloning OPNFV scenario repositories"
+echo "-------------------------------------------------------------------------"
+cd $XCI_PATH/playbooks
+ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i inventory get-opnfv-scenario-requirements.yml
+echo "-------------------------------------------------------------------------"
+
+#-------------------------------------------------------------------------------
+# Get scenario variables overrides
+#-------------------------------------------------------------------------------
+if [[ -f $XCI_PATH/scenarios/${OPNFV_SCENARIO:-_no_scenario_}/xci_overrides ]]; then
+    source $XCI_PATH/scenarios/$OPNFV_SCENARIO/xci_overrides
+fi
+
 #-------------------------------------------------------------------------------
 # Start provisioning VM nodes
 #-------------------------------------------------------------------------------
@@ -135,7 +154,7 @@ fi
 # - removes directories that were created by the previous xci run
 # - clones opnfv/releng-xci and openstack/bifrost repositories
 # - combines opnfv/releng-xci and openstack/bifrost scripts/playbooks
-# - destorys VMs, removes ironic db, leases, logs
+# - destroys VMs, removes ironic db, leases, logs
 # - creates and provisions VMs for the chosen flavor
 #-------------------------------------------------------------------------------
 echo "Info: Starting provisining VM nodes using openstack/bifrost"