xci: Bump OpenStack Ansbile SHAs

* Bump up upstream SHAs
* With these upstream SHAs, OSA installs neutron-agent container on
controller node which would require eth12 interface on controller for
establishing vlan provider networks. so adding eth12 interface and
linking it with br-vlan over br-vlan-veth link.

Change-Id: Iaf7cbe6e41dcfd15ec6527c5a50701f2d05eaad8
Signed-off-by: Markos Chandras <mchandras@suse.de>
Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>

diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions
index 9f069a6..760d2d5 100755 (executable)
--- a/xci/config/pinned-versions
+++ b/xci/config/pinned-versions
@@ -35,8 +35,8 @@ export BIFROST_IRONIC_CLIENT_VERSION=${BIFROST_IRONIC_CLIENT_VERSION:-"1da269b0e
 export BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-"84da941fafb905c2debdd9a9ba68ba743af3ce8a"}
 # HEAD of ironic-inspector-client "master" as of 13.02.2018
 export BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION:-"b73403fdad3165cfcccbf4b0330d426ae5925e01"}
-# HEAD of osa "master" as of 11.12.2017
-export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"7b3aac28a0a87e5966527829f6b0abcbc2303cc7"}
+# HEAD of osa "master" as of 13.02.2018
+export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"22aa7943c08f6dd3a65fa8ac8d647373e4ba3779"}
 export KEEPALIVED_VERSION=$(grep -E '.*name: keepalived' -A 3 \
        ${XCI_PATH}/xci/installer/osa/files/ansible-role-requirements.yml \
        | tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p')

diff --git a/xci/installer/osa/files/ansible-role-requirements.yml b/xci/installer/osa/files/ansible-role-requirements.yml
index 195244a..a1f7bb7 100644 (file)
--- a/xci/installer/osa/files/ansible-role-requirements.yml
+++ b/xci/installer/osa/files/ansible-role-requirements.yml
@@ -7,172 +7,172 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-# these versions are based on the osa commit 7b3aac28a0a87e5966527829f6b0abcbc2303cc7 on 2017-12-11
-# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=7b3aac28a0a87e5966527829f6b0abcbc2303cc7
+# these versions are based on the osa commit 22aa7943c08f6dd3a65fa8ac8d647373e4ba3779 on 2018-02-12
+# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=22aa7943c08f6dd3a65fa8ac8d647373e4ba3779
 - name: ansible-hardening
   scm: git
   src: https://git.openstack.org/openstack/ansible-hardening
-  version: 46a94c72518f83d27b25a5fa960dde7130956215
+  version: 295ef13395a2edf1922b0d5a31f224fdf4b0b525
 - name: apt_package_pinning
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
-  version: eba07d7dd7962d90301c49fc088551f9b35f367a
+  version: af87185d6d9a2ed066db85a9e6e2bec4d047089b
 - name: pip_install
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
-  version: 32c27505c6e0ee00ea0fb4a1c62240c60f17a0e3
+  version: 0f18e40fb61086b89cf12932cf9583adaf5b5609
 - name: galera_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
-  version: 9a8302cbba24ea4e5907567e5f93e874d30d79df
+  version: 934344ab4121e1a42a47b7946ff789672d5281cd
 - name: galera_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-galera_server
-  version: f2bfbd38513ac8d61ba4e02a4d5ef6cbbca259cc
+  version: 8132131a9022836a6512609cf58cc1dca9247a89
 - name: ceph_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
-  version: 34a04f7b24c80297866bc5ab56618e2211b1d5f9
+  version: ab68c5e925e086c91b1ad4064cb406cc736bdb23
 - name: haproxy_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
-  version: 9966fd96fede46c3b00c9e069e402eae90c66f17
+  version: 212e9bd262ee8fb9c635597516d56879ac817c7c
 - name: keepalived
   scm: git
   src: https://github.com/evrardjp/ansible-keepalived
-  version: 5deafcab39de162ac1550c58246963974e8dcf4e
+  version: 8bf7ebf48a81e04ac662b57baea281c12cd16fac
 - name: lxc_container_create
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
-  version: 68f81c679be88577633f98e8b9252a62bdcef754
+  version: 87353ebc316286b1f883124c45860a021e518889
 - name: lxc_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
-  version: 6b529de0315fe6cd12f6e78c00a5f2f2d3a01e28
+  version: 588f1ba9d1a89c3ff1e2bb14edb9bbbf929e7368
 - name: memcached_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
-  version: ae6f721dc0342e1e7b45ff2448ab51f7539dc01f
+  version: 0e526d63e68c9318dbe249ffcb355672c401268a
 - name: openstack_hosts
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
-  version: 05c7f09d181de1809fd596cc0d879c49e3f86bbf
+  version: 3e64936b228593d3dd59bf3b3203023b4c6e554c
 - name: os_keystone
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
-  version: cd9d4ef7d8614d241fa40ba33c1c205fd2b47fa1
+  version: 17f702aa093579e61b482c7496e2a1f056819483
 - name: openstack_openrc
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
-  version: d594c2debc249daa5b7f6f2890f546093efd1ee5
+  version: 735e066ba19caebb9299aaab163f5082d2b04bd4
 - name: os_aodh
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
-  version: ce871dee75511f94bfd24dde8f97e573cf6d3ead
+  version: 492ff856886ab096329dee337728e7c88482e9f9
 - name: os_barbican
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
-  version: c3e191037d0978479e3cb95a59b2986adab28c69
+  version: 348b65a58798df91acf3a1e77900e5895de0d51b
 - name: os_ceilometer
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
-  version: 55bb04eaad4dd5c7fdad742b3557dc30dc9d45bf
+  version: 0b88342fa352f2bc048104f66c9476f465d1d23d
 - name: os_cinder
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
-  version: 536dd3446e0fc7fc68ab42b982ac9affc4215787
+  version: 782c27cf60aa57cc2168ca51b6a8a7f2b43acfc6
 - name: os_designate
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_designate
-  version: a65d7a3394aef340ff94587dd0bb48133ed00763
+  version: 789991734e673f5cc1a01c46c93f827af7e5becc
 - name: os_glance
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_glance
-  version: 43aa00424f233a6125f7a9216cec42da1d8ca4c5
+  version: 0c541c2e938863200d25edbf35965a095e27f014
 - name: os_gnocchi
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
-  version: b1f7574dc529f8298a983d8d0e09520e90b571a8
+  version: f708fc326fd0105b27dfdbd03705c42bd2beb846
 - name: os_heat
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_heat
-  version: 0b3eb9348d55d6b1cf077a2c45b297f9a1be730d
+  version: dda5325225213c095c7c5697f30df8c41bcd9d4e
 - name: os_horizon
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
-  version: da72526dc1757688ecec8914344e330aaa0be720
+  version: ebf011624fcb86d1f17ead7feb6d4887cc03db1b
 - name: os_ironic
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
-  version: a90558f7a216e5e661c5d1a4048dbe30559542d1
+  version: 477222cec31beb1e981404b81c0e8dd5cd3750b5
 - name: os_magnum
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
-  version: 736d1707339cb99396578018a6bda7af9184fb02
+  version: 6e1c4cba27673960a24dec6fd0bcd4e4b2a0b365
 - name: os_molteniron
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron
-  version: 9b4c104a252c453bcd798fec9dbae7224b3d8001
+  version: 07c6cdc462a56e6c76e5071414d35da3878aa14f
 - name: os_neutron
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
-  version: 962cd92243641092412b6ef09a41bbf5e698c4a1
+  version: 293bec299811ff32ce5a62fdd18429ab8bb88734
 - name: os_nova
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_nova
-  version: 53df001c9034f198b9349def3c9158f8bbe43ff3
+  version: 92d058e5c5de0adfc1ca3fe8dc314b9af89d4943
 - name: os_octavia
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_octavia
-  version: 02ad3c68802287a1ba54cf10de085dcd14c324d8
+  version: e7ec923dafafba234a73a5d3236c4eafb5141827
 - name: os_rally
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_rally
-  version: bc9075dba204e64d11cb397017d32b0c2297eed0
+  version: 6c4e344def546adf76545d741a6ef24e5cbf7daa
 - name: os_sahara
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
-  version: 3c45121050ba21bd284f054d7b82a338f347157f
+  version: 6460f6731e7819365e3ab671f8ad929b395c1652
 - name: os_swift
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_swift
-  version: f31217bb097519f15755f2337165657d7eb6b014
+  version: 37eb776041ad324a01bc673da0eb7894566f419d
 - name: os_tacker
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_tacker
-  version: d95902891c4e6200510509c066006c921cfff8df
+  version: cf5ca79709982a296037799991e18f2c9b775ebb
 - name: os_tempest
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
-  version: 866dedbcba180ca82c3c93823cef3db2d3241d1b
+  version: 48d9b6d46965462aa01ef353ca06ffdbc5b55c33
 - name: os_trove
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_trove
-  version: b425fa316999d0863a44126f239a33d8c3fec3a6
+  version: 90fed1dbf420f9dcbc79d79d1ad9d654d84f8be4
 - name: plugins
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-plugins
-  version: d2f60237761646968a4b39b15185fb5c84e7386f
+  version: a9ee4932cb30522549db4866148ef066e2e2ab7d
 - name: rabbitmq_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
-  version: 311f76890c8f99cb0b46958775d84de614609323
+  version: f1ffba9e6f1b1da7262251d4a4bcd05935c0bd5f
 - name: repo_build
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-repo_build
-  version: 59a3f444c263235d8f0f584da8768656179fa02a
+  version: 1948d899a5c76143cf24c1a8ae162906a8e1faf1
 - name: repo_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-repo_server
-  version: 7889f37cdd2a90b4b98e8ef2e886f1fd4950fc0a
+  version: 0a3b993bf18f82fdf6199769302d971d917a8595
 - name: rsyslog_client
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
-  version: 310cfe9506d3742be10790533ad0d16100d81498
+  version: 6576a296328c7c2eeeec360978133913d81fb647
 - name: rsyslog_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
-  version: ba7bb699c0c874c7977add86ca308ca18be8f9a8
+  version: 3e1db84f1a9be6473bfbb8f80495f747b406e8ef
 - name: sshd
   scm: git
   src: https://github.com/willshersystems/ansible-sshd
@@ -180,7 +180,7 @@
 - name: bird
   scm: git
   src: https://github.com/logan2211/ansible-bird
-  version: 5033c412398cf6f98097a9ac274a6f12810c807e
+  version: 21d7d8de5af9e73c0853d3434a4b3d3f8dd39a70
 - name: etcd
   scm: git
   src: https://github.com/logan2211/ansible-etcd
@@ -193,34 +193,14 @@
   scm: git
   src: https://github.com/logan2211/ansible-resolvconf
   version: d48dd3eea22094b6ecc6aa6ea07279c8e68e28b5
-- name: ceph-defaults
+- name: ceph-ansible
   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: 08804bd46dff42ebff64e7f27c86f2265fe4d6fc
-- 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: 309b7e339e057d56d9dd38bdd61998b900f45ba8
-- 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: e022d6773bc827e75ad051b429dec786a75d68f4
+  src: https://github.com/ceph/ceph-ansible
+  version: 699c777e680655be12f53cabed626b28623f8160
 - name: opendaylight
   scm: git
   src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
-  version: ef1367ad15ad10ac8cc9416f6fd49fd8b350d377
+  version: 4aabce0605ef0f51eef4d6564cc7d779630706c5
 - name: haproxy_endpoints
   scm: git
   src: https://github.com/logan2211/ansible-haproxy-endpoints

diff --git a/xci/installer/osa/files/global-requirement-pins.txt b/xci/installer/osa/files/global-requirement-pins.txt
index aa3b116..fd40185 100644 (file)
--- a/xci/installer/osa/files/global-requirement-pins.txt
+++ b/xci/installer/osa/files/global-requirement-pins.txt
@@ -10,5 +10,5 @@
 ### These pins are updated through the sources-branch-updater script ###
 ###
 pip==9.0.1
-setuptools==36.6.0
+setuptools==38.5.1
 wheel==0.30.0

diff --git a/xci/installer/osa/files/openstack_services.yml b/xci/installer/osa/files/openstack_services.yml
index 8650163..fa00d76 100644 (file)
--- a/xci/installer/osa/files/openstack_services.yml
+++ b/xci/installer/osa/files/openstack_services.yml
@@ -31,192 +31,210 @@
 
 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: 691711c0effddd9cbaaadba3d494c15bc422fdd5 # HEAD of "master" as of 24.11.2017
+requirements_git_install_branch: 2ffaa4cc24f145cc9188c8cd04a4cf542fa0d8d1 # HEAD of "master" as of 19.12.2017
 
 
 ## Aodh service
 aodh_git_repo: https://git.openstack.org/openstack/aodh
-aodh_git_install_branch: 359043dc774be847cb539d18d13e336d40453e72 # HEAD of "master" as of 24.11.2017
+aodh_git_install_branch: b4a64743780b7a930146b195df64c06a342cd855 # HEAD of "master" as of 19.12.2017
 aodh_git_project_group: aodh_all
 
 
 ## Barbican service
 barbican_git_repo: https://git.openstack.org/openstack/barbican
-barbican_git_install_branch: 5617d605f2e12840933e4a9d6417912cdbb811d5 # HEAD of "master" as of 24.11.2017
+barbican_git_install_branch: a74f8987523e98e0babfb53a3401d377e5c0d045 # HEAD of "master" as of 19.12.2017
 barbican_git_project_group: barbican_all
 
 
 ## Ceilometer service
 ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
-ceilometer_git_install_branch: bd464f1f572ba150f52e284de430d13045dc6c18 # HEAD of "master" as of 24.11.2017
+ceilometer_git_install_branch: 0ae26d72f280b14222244623112aa4c219965923 # HEAD of "master" as of 19.12.2017
 ceilometer_git_project_group: ceilometer_all
 
 
 ## Cinder service
 cinder_git_repo: https://git.openstack.org/openstack/cinder
-cinder_git_install_branch: 80558687d0fa55f2adf699e7369ebe3dbc3591bf # HEAD of "master" as of 24.11.2017
+cinder_git_install_branch: 8b389b8b21c98bafa368c421ab4f44c81b8a8552 # HEAD of "master" as of 19.12.2017
 cinder_git_project_group: cinder_all
 
 
 ## Designate service
 designate_git_repo: https://git.openstack.org/openstack/designate
-designate_git_install_branch: 2f75586379e8d611f37e06d385e79d0bc2c84ca1 # HEAD of "master" as of 24.11.2017
+designate_git_install_branch: 0740dbb53d8e3d5be40f12a377c63385a3108d5d # HEAD of "master" as of 19.12.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: 571e127e5f853aa4dbdd377d831e32f8ff81eafe # HEAD of "master" as of 24.11.2017
+designate_dashboard_git_install_branch: 642edf494b0f12e05de69b98a4a9fd618950ba4f # HEAD of "master" as of 19.12.2017
 designate_dashboard_git_project_group: horizon_all
 
 
 ## Dragonflow service
 dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow
-dragonflow_git_install_branch: 7bf00cf315659252f03f6c65f6159a924da6f978 # HEAD of "master" as of 24.11.2017
+dragonflow_git_install_branch: 66cb5582b070d05a2afc1eac04ca6493ccda2cf0 # HEAD of "master" as of 19.12.2017
 dragonflow_git_project_group: neutron_all
 
 
 ## Glance service
 glance_git_repo: https://git.openstack.org/openstack/glance
-glance_git_install_branch: d88bd2ca8ef95810441dae640d3c6b9e79eca353 # HEAD of "master" as of 24.11.2017
+glance_git_install_branch: 3ac9fa6503456ff3e6847082d33920694a683c23 # HEAD of "master" as of 19.12.2017
 glance_git_project_group: glance_all
 
 
 ## Heat service
 heat_git_repo: https://git.openstack.org/openstack/heat
-heat_git_install_branch: f4a06c2a92a361dbb401107b4ea1ab60972f473e # HEAD of "master" as of 24.11.2017
+heat_git_install_branch: 622af9952b9fceae328d815ceb7f651c2cb73c61 # HEAD of "master" as of 19.12.2017
 heat_git_project_group: heat_all
 
 
 ## Horizon service
 horizon_git_repo: https://git.openstack.org/openstack/horizon
-horizon_git_install_branch: 846d269d90e01e463b510474040e0ad984a5679f # HEAD of "master" as of 24.11.2017
+horizon_git_install_branch: 0f598182919df31e40c7630ee1bd42bea259310d # HEAD of "master" as of 19.12.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: d6199d51171e6c8700663b0b0618ee0adf033b4d # HEAD of "master" as of 24.11.2017
+ironic_dashboard_git_install_branch: 65f0af6887c8a3e8b48a404f3630b6824dcea44a # HEAD of "master" as of 19.12.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: 6160d903fae9c652b459c93c218e0ea75924a85d # HEAD of "master" as of 24.11.2017
+magnum_dashboard_git_install_branch: 8f7a4ec5f005de37ceb8d86b4ba27980a770f0a3 # HEAD of "master" as of 19.12.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: ef650294bcc7447d441e6a710c39d64e384e1b27 # HEAD of "master" as of 24.11.2017
+neutron_lbaas_dashboard_git_install_branch: bc50c49f7d77f8b7057820a9cf90fd36f67876b2 # HEAD of "master" as of 19.12.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: 6de122d4753a6db24d2dc4c22a71e702ed980e82 # HEAD of "master" as of 24.11.2017
+neutron_fwaas_dashboard_git_install_branch: 79434afbf5847dde3c69eb8bd2df6c3763bb0dce # HEAD of "master" as of 19.12.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: 3e5c59e6229dac8b303029058fcee9d61200ebc8 # HEAD of "master" as of 24.11.2017
+sahara_dashboard_git_install_branch: f1a4018f65b330b667db3e74e6ed0d93a0e3105f # HEAD of "master" as of 19.12.2017
 sahara_dashboard_git_project_group: horizon_all
 
 
 ## Keystone service
 keystone_git_repo: https://git.openstack.org/openstack/keystone
-keystone_git_install_branch: 70fe4ec09b55def21361a32c8fa7f12e7c891ab1 # HEAD of "master" as of 24.11.2017
+keystone_git_install_branch: 07bba320ae3d0e7fb9d2fb2a1c5df51735761bac # HEAD of "master" as of 19.12.2017
 keystone_git_project_group: keystone_all
 
 
 ## Neutron service
 neutron_git_repo: https://git.openstack.org/openstack/neutron
-neutron_git_install_branch: d1277c1630570ca45b490c48371e3f7e97be78c3 # HEAD of "master" as of 24.11.2017
+neutron_git_install_branch: 92bd6b20b031ccb6aa898fc7dc27ec5adda28033 # HEAD of "master" as of 19.12.2017
 neutron_git_project_group: neutron_all
 
 neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
-neutron_lbaas_git_install_branch: b1123e7a759248dfa63afdf8b86aafd692572ebd # HEAD of "master" as of 24.11.2017
+neutron_lbaas_git_install_branch: 3014d52287f858487df72ce4132e5c013e128d73 # HEAD of "master" as of 19.12.2017
 neutron_lbaas_git_project_group: neutron_all
 
 neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
-neutron_vpnaas_git_install_branch: 79e4eb81dd05588bcf68b92d46c62f0d26153542 # HEAD of "master" as of 24.11.2017
+neutron_vpnaas_git_install_branch: 84db0e747bb4a27c55c7c628088b6c653dd86947 # HEAD of "master" as of 19.12.2017
 neutron_vpnaas_git_project_group: neutron_all
 
 neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
-neutron_fwaas_git_install_branch: 74eac2ca2980e6162d9c88ee6bd48830386c392a # HEAD of "master" as of 24.11.2017
+neutron_fwaas_git_install_branch: cef88d227d576018d805b084428a612ec458c004 # HEAD of "master" as of 19.12.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: 183c3fa4840d22be1974534eb9e1b28b552f4a42 # HEAD of "master" as of 24.11.2017
+neutron_dynamic_routing_git_install_branch: 6588364116a51ad4ef5748440b0ec282170c970e # HEAD of "master" as of 19.12.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 24.11.2017
+networking_calico_git_install_branch: 9688df1a3d1d8b3fd9ba367e82fe6b0559416728 # HEAD of "master" as of 19.12.2017
 networking_calico_git_project_group: neutron_all
 
+networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl
+networking_odl_git_install_branch: 55ad38a606680e5cbe4463ee7e4f84ffbde6dcbb # HEAD of "master" as of 19.12.2017
+networking_odl_git_project_group: neutron_all
+
+networking_bgpvpn_git_repo: https://git.openstack.org/openstack/networking-bgpvpn
+networking_bgpvpn_git_install_branch: e289789620635ffdfd7d53a076959a4254141d97 # HEAD of "master" as of 19.12.2017
+networking_bgpvpn_git_project_group: neutron_all
+
+networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc
+networking_sfc_git_install_branch: 06536b65f8277fe3955f2a94809514f695bd6855 # HEAD of "master" as of 19.12.2017
+networking_sfc_git_project_group: neutron_all
+
+
 ## Nova service
 nova_git_repo: https://git.openstack.org/openstack/nova
-nova_git_install_branch: 22a790ef45b0523e8cf2ed97d14e050431c90fd9 # HEAD of "master" as of 24.11.2017
+nova_git_install_branch: e502f0d073d01ffc1a62c3df482c34687628fb61 # HEAD of "master" as of 19.12.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: f2de4441e39b0f66cf31f854b228e9e7037f04de # HEAD of "master" as of 24.11.2017
+nova_powervm_git_install_branch: ce0d45daf4e0fc975c6cdd34ae12deadd185c959 # HEAD of "master" as of 19.12.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: e498de603b31c189fd32a6067d45a36575b96b0a # HEAD of "master" as of 24.11.2017
+nova_lxd_git_install_branch: 1440684e3bed48b2bbaa4ee69d2c5ea451aed00c # HEAD of "master" as of 19.12.2017
 nova_lxd_git_project_group: nova_all
 
 
 ## Sahara service
 sahara_git_repo: https://git.openstack.org/openstack/sahara
-sahara_git_install_branch: 395856c513b1efad82db8fa78fb1cbfe0f3a6749 # HEAD of "master" as of 24.11.2017
+sahara_git_install_branch: 13184124829f8473f713289be043162b221eec7e # HEAD of "master" as of 19.12.2017
 sahara_git_project_group: sahara_all
 
 
 ## Swift service
 swift_git_repo: https://git.openstack.org/openstack/swift
-swift_git_install_branch: 3135878d2fe9909f49fcadeeb9cc6c6933d06127 # HEAD of "master" as of 24.11.2017
+swift_git_install_branch: 8dcef649757dc029d2fc7d776b9e7f8926f2bbd5 # HEAD of "master" as of 19.12.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 24.11.2017
+swift_swift3_git_install_branch: f0215ae853adc29fcb8b3df5f8d335f4f7fc1896 # HEAD of "master" as of 19.12.2017
 swift_swift3_git_project_group: swift_all
 
 
 ## Ironic service
 ironic_git_repo: https://git.openstack.org/openstack/ironic
-ironic_git_install_branch: 27ce77142bfb9ac56e85db37e0923a0eb47f2f7a # HEAD of "master" as of 24.11.2017
+ironic_git_install_branch: 435328e54f1da43f75b53f5c3a2c33f6a22bdb85 # HEAD of "master" as of 19.12.2017
 ironic_git_project_group: ironic_all
 
+
 ## Magnum service
 magnum_git_repo: https://git.openstack.org/openstack/magnum
-magnum_git_install_branch: 4bf3b3263870a4ec81cf372713cacec446b3ee84 # HEAD of "master" as of 24.11.2017
+magnum_git_install_branch: 273405cb5a8cdbcec816f646cfe82f13784b3bf1 # HEAD of "master" as of 19.12.2017
 magnum_git_project_group: magnum_all
 
+
 ## Trove service
 trove_git_repo: https://git.openstack.org/openstack/trove
-trove_git_install_branch: b09d0eb3135047891a369d3c0eb2c6e9ae649f5b # HEAD of "master" as of 24.11.2017
+trove_git_install_branch: ccb6752f6973a7d1c8bb08675fde421710942998 # HEAD of "master" as of 19.12.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: 14a4609606d42cae827b8fc6b44453caea258976 # HEAD of "master" as of 24.11.2017
+trove_dashboard_git_install_branch: 9362f2dbe042fa492e0330de140833a2297ef659 # HEAD of "master" as of 19.12.2017
 trove_dashboard_git_project_group: horizon_all
 
+
 ## Octavia service
 octavia_git_repo: https://git.openstack.org/openstack/octavia
-octavia_git_install_branch: bb9bb2d05b268cff9846e0a09ad3940be5fe5a80 # HEAD of "master" as of 24.11.2017
+octavia_git_install_branch: 0008afb88fd70500531df336e67cccf0f20b53d9 # HEAD of "master" as of 19.12.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 24.11.2017
+molteniron_git_install_branch: 094276cda77d814d07ad885e7d63de8d1243750a # HEAD of "master" as of 19.12.2017
 molteniron_git_project_group: molteniron_all
 
+
 ## Tacker service
 tacker_git_repo: https://git.openstack.org/openstack/tacker
-tacker_git_install_branch: cc03b5d952527b8cad2e2e309a97d55afb1ca559 # HEAD of "master" as of 24.11.2017
+tacker_git_install_branch: 4cb1b76222e4397030112a2364b8ef4a0df2d14e # HEAD of "master" as of 19.12.2017
 tacker_git_project_group: tacker_all

diff --git a/xci/playbooks/roles/configure-network/templates/debian/controller00.interface.j2 b/xci/playbooks/roles/configure-network/templates/debian/controller00.interface.j2
index 5d42a5d..b461b20 100644 (file)
--- a/xci/playbooks/roles/configure-network/templates/debian/controller00.interface.j2
+++ b/xci/playbooks/roles/configure-network/templates/debian/controller00.interface.j2
@@ -54,6 +54,14 @@ iface br-vlan inet static
     netmask 255.255.255.0
     gateway 192.168.122.1
     dns-nameserver 8.8.8.8 8.8.4.4
+   # Create veth pair, don't bomb if already exists
+   pre-up ip link add br-vlan-veth type veth peer name eth12 || true
+   # Set both ends UP
+   pre-up ip link set br-vlan-veth up
+   pre-up ip link set eth12 up
+   # Delete veth pair on DOWN
+   post-down ip link del br-vlan-veth || true
+   bridge_ports br-vlan-veth
 
 # OpenStack Storage bridge
 auto br-storage