Merge "Start Ussuri cycle"

2019-10-30 04:51:45 +00:00 · 2019-10-30 04:51:45 +00:00 · fa005d4023
commit fa005d4023
parent 39c44abdbc 3fbc5b959a
7 changed files with 178 additions and 154 deletions
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@ -1,97 +1,97 @@
 - name: ansible-hardening
  scm: git
  src: https://opendev.org/openstack/ansible-hardening
-  version: 9cfc60f3072558e54231d978e5c49b514ffcfa03
+  version: master
  trackbranch: master
 - name: apt_package_pinning
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
-  version: c469744a99fc8c6f13af2692df46c920d46d9693
+  version: master
  trackbranch: master
 - name: config_template
  scm: git
  src: https://opendev.org/openstack/ansible-config_template
-  version: faf60ddb53dd3d345ea3644f818805a3d356b104
+  version: master
  trackbranch: master
 - name: galera_client
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-galera_client
-  version: c0f11db478985619cab26b8a6b3193cb86b7fcaa
+  version: master
  trackbranch: master
 - name: galera_server
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-galera_server
-  version: 7132d760bee431635855559596803a6f80aa3090
+  version: master
  trackbranch: master
 - name: ceph_client
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-ceph_client
-  version: 21f85fae9a8d3113137acef81c728fd347688d7a
+  version: master
  trackbranch: master
 - name: haproxy_server
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-haproxy_server
-  version: 500398b8195fed344ed376f7c518e8cf7bae56c2
+  version: master
  trackbranch: master
 - name: keepalived
  scm: git
  src: https://github.com/evrardjp/ansible-keepalived
-  version: 8bbfc283d9bc07fb7ae63168844a01146d4f8697
+  version: master
  trackbranch: master
 - name: lxc_container_create
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-lxc_container_create
-  version: a53247e5a8177f77a575196502396fd0012a5c74
+  version: master
  trackbranch: master
 - name: lxc_hosts
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-lxc_hosts
-  version: 23c6e8525986b0635f0d8c55a3757ec57fb1b29e
+  version: master
  trackbranch: master
 - name: memcached_server
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-memcached_server
-  version: 88bc0fade74cb2eae04ff50e6b11b1e326bf66de
+  version: master
  trackbranch: master
 - name: openstack_hosts
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-openstack_hosts
-  version: d71b439ba2708dc333a2733dbc1a828ee75b4137
+  version: master
  trackbranch: master
 - name: os_keystone
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_keystone
-  version: aac229121fe87422b018716f6e04ad235d8a695e
+  version: master
  trackbranch: master
 - name: openstack_openrc
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-openstack_openrc
-  version: c24af1a2b9c228e2b0a3b54d5e70fed3ca35217d
+  version: master
  trackbranch: master
 - name: os_aodh
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_aodh
-  version: b633e2127bf3e548a73155e7d3598adb52f60aa4
+  version: master
  trackbranch: master
 - name: os_barbican
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_barbican
-  version: 1c6095ff02e2c19cc7445ad5fc485e366fcbbaaa
+  version: master
  trackbranch: master
 - name: os_blazar
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_blazar
-  version: 23ed64b6fce0af1ba9e6290a1fdd8544ea98e089
+  version: master
  trackbranch: master
 - name: os_ceilometer
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_ceilometer
-  version: 9906ecd5bdf592a2233ffdcce4bcc35931488724
+  version: master
  trackbranch: master
 - name: os_cinder
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_cinder
-  version: 402f4f43f4401539c6ba8354ec4e39802abca891
+  version: master
  trackbranch: master
 - name: os_cloudkitty
  scm: git
@ -101,57 +101,57 @@
 - name: os_congress
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_congress
-  version: 6ff69c6f5632f00258e06f137b3cd83c1e31ac47
+  version: master
  trackbranch: master
 - name: os_designate
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_designate
-  version: 629a0e00cbe2ca8836c52d90036fe249d2426519
+  version: master
  trackbranch: master
 - name: os_glance
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_glance
-  version: d1c03539b8e4969a27047c416de09a835945dd9d
+  version: master
  trackbranch: master
 - name: os_gnocchi
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_gnocchi
-  version: e4babdd7c838e3a26c15daa84c9c0f0391c307d8
+  version: master
  trackbranch: master
 - name: os_heat
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_heat
-  version: 728666c9de1f835ecc2648a2a1abb43e47501031
+  version: master
  trackbranch: master
 - name: os_horizon
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_horizon
-  version: b7d1f7e26115758507e649e8542cc9d126fe152e
+  version: master
  trackbranch: master
 - name: os_ironic
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_ironic
-  version: 089a1bd3455052be2f0b65cffda814bafc8933f7
+  version: master
  trackbranch: master
 - name: os_magnum
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_magnum
-  version: abb576246cfa2802719914355e35928ec85a6ec2
+  version: master
  trackbranch: master
 - name: os_manila
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_manila
-  version: acc94725e34122496b602709213a5eef9c8e8690
+  version: master
  trackbranch: master
 - name: os_masakari
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_masakari
-  version: f5c1defc5a7387dee55470f18d7195937fb014c0
+  version: master
  trackbranch: master
 - name: os_mistral
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_mistral
-  version: fd002ac32bf989f90d1614dfb93b4848d4ff001d
+  version: master
  trackbranch: master
 - name: os_murano
  scm: git
@ -161,57 +161,57 @@
 - name: os_neutron
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_neutron
-  version: 2f1b789e06b3e91201ca312c81c9d2a17fc322f8
+  version: master
  trackbranch: master
 - name: os_nova
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_nova
-  version: 8bd5fda366680682163aad65bce02deab36c436b
+  version: master
  trackbranch: master
 - name: os_octavia
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_octavia
-  version: 942a245af6cea7de2c056ad1fe6178b61a812908
+  version: master
  trackbranch: master
 - name: os_panko
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_panko
-  version: bf7140aa240537d0964c32b6a3b36ff2b2a98d07
+  version: master
  trackbranch: master
 - name: os_placement
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_placement
-  version: 34d33864b67da87f3d5659bacbaaa71264e59d20
+  version: master
  trackbranch: master
 - name: os_rally
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_rally
-  version: 2e31110da3c2bbd520b94c4a9c2d454b00f8b268
+  version: master
  trackbranch: master
 - name: os_sahara
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_sahara
-  version: 1f404d558cfb1235dc7e5c91cefba3ee390081dc
+  version: master
  trackbranch: master
 - name: os_swift
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_swift
-  version: 97790114dc89ed1b726b396dc37a2240b2508350
+  version: master
  trackbranch: master
 - name: os_tacker
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_tacker
-  version: fbb709dc96909697ae28b7a4c4bfcfa2beb4f19e
+  version: master
  trackbranch: master
 - name: os_tempest
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_tempest
-  version: 5e554a3fdfb7f33386ea1cf41b4d2267d55dcd2c
+  version: master
  trackbranch: master
 - name: os_trove
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-os_trove
-  version: 96821b4ba9ceda23d990422fda508f65be23242d
+  version: master
  trackbranch: master
 - name: os_zun
  scm: git
@ -221,105 +221,105 @@
 - name: plugins
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-plugins
-  version: 24fe4789c89ca822bea3b3f01fa889f6b32002e4
+  version: master
  trackbranch: master
 - name: qdrouterd
  scm: git
  src: https://opendev.org/openstack/ansible-role-qdrouterd
-  version: 99d0f00060b67498b20e8e7588156592dfa427ec
+  version: master
  trackbranch: master
 - name: rabbitmq_server
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server
-  version: 2332b70d4d1eec224aa833848fd2e7803ef07257
+  version: master
  trackbranch: master
 - name: repo_server
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-repo_server
-  version: 03ce118a8d3a1ddcf41bb8267e2056419bd2e6b5
+  version: master
  trackbranch: master
 - name: rsyslog_client
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-rsyslog_client
-  version: bd77b290e5112fbffc5983424603764d294b91c5
+  version: master
  trackbranch: master
 - name: rsyslog_server
  scm: git
  src: https://opendev.org/openstack/openstack-ansible-rsyslog_server
-  version: df00bf7f03858915833bcf1b31b78f9e3f1d76d9
+  version: master
  trackbranch: master
 - name: sshd
  scm: git
  src: https://github.com/willshersystems/ansible-sshd
-  version: 454bcb828fd645ad5f43e48ee498ca974faca729
+  version: master
  trackbranch: master
 - name: bird
  scm: git
  src: https://github.com/logan2211/ansible-bird
-  version: c755eb300b12ecb659e92375fa0572efec74846f
+  version: master
  trackbranch: master
 - name: etcd
  scm: git
  src: https://github.com/logan2211/ansible-etcd
-  version: fa1c447b6a979a614fc024725b5ecad215261c4a
+  version: master
  trackbranch: master
 - name: unbound
  scm: git
  src: https://github.com/logan2211/ansible-unbound
-  version: f8e2d8a89ddb9352d5748332a5f3a33ed33f66ab
+  version: master
  trackbranch: master
 - name: resolvconf
  scm: git
  src: https://github.com/logan2211/ansible-resolvconf
-  version: a2ff5ba59b47f96ddddcb7a3a67de93687c317a6
+  version: master
  trackbranch: master
 - name: ceph-ansible
  scm: git
  src: https://github.com/ceph/ceph-ansible
-  version: 021c55530765395b6291c0befc7feaccb46546ca
+  version: stable-4.0
  trackbranch: stable-4.0
 - name: opendaylight
  scm: git
  src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
-  version: 4a9217ed0fe9078152435daaa2d3f45b81021b3a
+  version: master
  trackbranch: master
 - name: haproxy_endpoints
  scm: git
  src: https://github.com/logan2211/ansible-haproxy-endpoints
-  version: 8e3a24a35beb16d717072dc83895c5a1f92689fb
+  version: master
  trackbranch: master
 - name: nspawn_container_create
  src: https://opendev.org/openstack/openstack-ansible-nspawn_container_create
  scm: git
-  version: b7861939fe58dd87d386c43a26b584e1a4488bf8
+  version: master
  trackbranch: master
 - name: nspawn_hosts
  src: https://opendev.org/openstack/openstack-ansible-nspawn_hosts
  scm: git
-  version: 11594a85aeb82159b5f5e267b861c8f6374e50c1
+  version: master
  trackbranch: master
 - name: systemd_service
  src: https://opendev.org/openstack/ansible-role-systemd_service
  scm: git
-  version: 83bff1a16ff2a182943bdc1c6157ee6b0823ad3f
+  version: master
  trackbranch: master
 - name: systemd_mount
  src: https://opendev.org/openstack/ansible-role-systemd_mount
  scm: git
-  version: 6acf8cb6589ce3e04511c3e8d2484d118c12e8f0
+  version: master
  trackbranch: master
 - name: systemd_networkd
  src: https://opendev.org/openstack/ansible-role-systemd_networkd
  scm: git
-  version: 658b32023d08e525e7b40b30c1b2dd8e41f9ed71
+  version: master
  trackbranch: master
 - name: python_venv_build
  src: https://opendev.org/openstack/ansible-role-python_venv_build
  scm: git
-  version: 8e13d0d0144cd5ad45b2ac4cd8381174be435d82
+  version: master
  trackbranch: master
 - name: uwsgi
  src: https://opendev.org/openstack/ansible-role-uwsgi
  scm: git
-  version: b88d50704b9912011ef039a3c62808c228e4d4b8
+  version: master
  trackbranch: master
--- a/deploy-guide/source/conf.py
+++ b/deploy-guide/source/conf.py
@ -33,8 +33,8 @@ import openstackdocstheme
 # Variables to override
 target_name = 'openstack-ansible'
 description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.'
-previous_series_name = 'stein'
-current_series_name = 'train'
+previous_series_name = 'train'
+current_series_name = 'ussuri'

 # General information about the project.
 author = 'OpenStack-Ansible Contributors'
@ -323,4 +323,4 @@ texinfo_documents = [
 pdf_documents = [
    (master_doc, target_name,
     title, author)
-]
+]
--- a/playbooks/defaults/repo_packages/gnocchi.yml
+++ b/playbooks/defaults/repo_packages/gnocchi.yml
@ -32,7 +32,8 @@
 ## Gnocchi service
 ## This service has a different stable branch strategy to the rest of OpenStack.
 ## The SHA is recorded here to make the SHA updating easier.
+# track branch needs to be updated to 4.4 when it's out.
 gnocchi_git_repo: https://github.com/gnocchixyz/gnocchi
-gnocchi_git_install_branch: 8cbc9ee4c3ff35786fd2d091756e9469abd49e1d  # HEAD as of 17.10.2019
+gnocchi_git_install_branch: 8cbc9ee4c3ff35786fd2d091756e9469abd49e1d  # HEAD as of 24.10.2019
 gnocchi_git_project_group: gnocchi_all
 gnocchi_git_track_branch: stable/4.3
--- a/playbooks/defaults/repo_packages/nova_consoles.yml
+++ b/playbooks/defaults/repo_packages/nova_consoles.yml
@ -37,7 +37,7 @@ novncproxy_git_track_branch: None

 ## spice-html5 from source
 spicehtml5_git_repo: https://gitlab.freedesktop.org/spice/spice-html5.git
-spicehtml5_git_install_branch: 5fae52199b9726053449007189ab15aba57cffa1 # HEAD as of 17.10.2019
+spicehtml5_git_install_branch: 5fae52199b9726053449007189ab15aba57cffa1 # HEAD as of 24.10.2019
 spicehtml5_git_project_group: nova_console
 spicehtml5_git_track_branch: master

--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@ -31,159 +31,159 @@

 ## Global Requirements
 requirements_git_repo: https://opendev.org/openstack/requirements
-requirements_git_install_branch: 5d2dc701ab2fe7e87d78e4d96eb444766eef6725 # HEAD as of 17.10.2019
-requirements_git_track_branch: stable/train
+requirements_git_install_branch: 888ce8564abe71be3aec2401d36f917af6404c1a # HEAD as of 24.10.2019
+requirements_git_track_branch: master


 ## Aodh service
 aodh_git_repo: https://opendev.org/openstack/aodh
-aodh_git_install_branch: 9e17daad69c65792c8e03d6e39a9601f6972a8c6  # HEAD as of 17.10.2019
+aodh_git_install_branch: b47550ae447c81135a1145c7ea8b90004798b4b5  # HEAD as of 24.10.2019
 aodh_git_project_group: aodh_all
-aodh_git_track_branch: stable/train
+aodh_git_track_branch: master


 ## Barbican service
 barbican_git_repo: https://opendev.org/openstack/barbican
-barbican_git_install_branch: 321158666f431868bea575c7546303bb45c626f4  # HEAD as of 17.10.2019
+barbican_git_install_branch: d274eb74523a131951920d814ab2bde513f366aa  # HEAD as of 24.10.2019
 barbican_git_project_group: barbican_all
-barbican_git_track_branch: stable/train
+barbican_git_track_branch: master


 ## Ceilometer service
 ceilometer_git_repo: https://opendev.org/openstack/ceilometer
-ceilometer_git_install_branch: 7962947310d784fdfccf03512468ee2eec0c9ffa  # HEAD as of 17.10.2019
+ceilometer_git_install_branch: 449486f0fa44d5a1196b79eef19c1f936956afb6  # HEAD as of 24.10.2019
 ceilometer_git_project_group: all
-ceilometer_git_track_branch: stable/train
+ceilometer_git_track_branch: master


 ## Cinder service
 cinder_git_repo: https://opendev.org/openstack/cinder
-cinder_git_install_branch: 293910c8d80b1f91b381f2f2821fa39cac739f3c  # HEAD as of 17.10.2019
+cinder_git_install_branch: efdd262e8a0ea9db35c1f8e76d488e612aab7d30  # HEAD as of 24.10.2019
 cinder_git_project_group: cinder_all
-cinder_git_track_branch: stable/train
+cinder_git_track_branch: master


 ## Designate service
 designate_git_repo: https://opendev.org/openstack/designate
-designate_git_install_branch: 408a90d941edb969dbdb96e729b8630ef5a339e3  # HEAD as of 17.10.2019
+designate_git_install_branch: 1cd2dddf3f181a792b9cb2e9fd02b11ea9896f11  # HEAD as of 24.10.2019
 designate_git_project_group: designate_all
-designate_git_track_branch: stable/train
+designate_git_track_branch: master


 ## Horizon Designate dashboard plugin
 designate_dashboard_git_repo: https://opendev.org/openstack/designate-dashboard
-designate_dashboard_git_install_branch: f0e33a7de4415ea91ea837d721960434a893145a  # HEAD as of 17.10.2019
+designate_dashboard_git_install_branch: 38227c722fa12b26e6adefa455a253ba65777b98  # HEAD as of 24.10.2019
 designate_dashboard_git_project_group: horizon_all
-designate_dashboard_git_track_branch: stable/train
+designate_dashboard_git_track_branch: master


 ## Glance service
 glance_git_repo: https://opendev.org/openstack/glance
-glance_git_install_branch: f87464e022046c9d61384c2593edf9753ed34749  # HEAD as of 17.10.2019
+glance_git_install_branch: 99938b8afeebcdafc7baa07b73b7762abcc646a7  # HEAD as of 24.10.2019
 glance_git_project_group: glance_all
-glance_git_track_branch: stable/train
+glance_git_track_branch: master


 ## Heat service
 heat_git_repo: https://opendev.org/openstack/heat
-heat_git_install_branch: 747e4b765840cc2e5ac5d7862d8db7ee500df902  # HEAD as of 17.10.2019
+heat_git_install_branch: 9f3ea0a63e6b0702dd88bc230af9ddf13621e017  # HEAD as of 24.10.2019
 heat_git_package_name: openstack-heat
 heat_git_project_group: heat_all
-heat_git_track_branch: stable/train
+heat_git_track_branch: master

 ## Horizon Heat dashboard plugin
 heat_dashboard_git_repo: https://opendev.org/openstack/heat-dashboard
-heat_dashboard_git_install_branch: 93076a63e48b2c069dd724e77b9f4303be068a22  # HEAD as of 17.10.2019
+heat_dashboard_git_install_branch: 5efee7595524246b61a082ca93964f750878945b  # HEAD as of 24.10.2019
 heat_dashboard_git_project_group: horizon_all
-heat_dashboard_git_track_branch: stable/train # Not branched yet
+heat_dashboard_git_track_branch: master

 ## Horizon service
 horizon_git_repo: https://opendev.org/openstack/horizon
-horizon_git_install_branch: 26c97d910a135d1ab1bd8ecd47f5bd80355b5624  # HEAD as of 17.10.2019
+horizon_git_install_branch: 85a1dddf126691921924edcecaee5c054c7df6c2  # HEAD as of 24.10.2019
 horizon_git_project_group: horizon_all
-horizon_git_track_branch: stable/train
+horizon_git_track_branch: master

 ## Horizon Ironic dashboard plugin
 ironic_dashboard_git_repo: https://opendev.org/openstack/ironic-ui
-ironic_dashboard_git_install_branch: 57c2b37f9b2643699f91fb6cbe6b2baf5f22363e  # HEAD as of 17.10.2019
+ironic_dashboard_git_install_branch: c5585c00d487a4f119456dd7d63abe6eed0cb1bb  # HEAD as of 24.10.2019
 ironic_dashboard_git_project_group: horizon_all
-ironic_dashboard_git_track_branch: stable/train
+ironic_dashboard_git_track_branch: master

 ## Horizon Magnum dashboard plugin
 magnum_dashboard_git_repo: https://opendev.org/openstack/magnum-ui
-magnum_dashboard_git_install_branch: a6d467e55422baf1cae2480684b257467b9e4451  # HEAD as of 17.10.2019
+magnum_dashboard_git_install_branch: c6a69f3d126bc677d1b217a7cfd720a042968bc5  # HEAD as of 24.10.2019
 magnum_dashboard_git_project_group: horizon_all
-magnum_dashboard_git_track_branch: stable/train
+magnum_dashboard_git_track_branch: master

 ## Horizon Masakari dashboard plugin
 masakari_dashboard_git_repo: https://opendev.org/openstack/masakari-dashboard
-masakari_dashboard_git_install_branch: 9ab2779484f99ea01b978db47a56242035113222  # HEAD as of 17.10.2019
+masakari_dashboard_git_install_branch: 43e557c5b32094b05867343c37d63027e4d8ffcc  # HEAD as of 24.10.2019
 masakari_dashboard_git_project_group: horizon_all
-masakari_dashboard_git_track_branch: stable/train # Not branched yet
+masakari_dashboard_git_track_branch: master

 ## Horizon FWaaS dashboard plugin
 neutron_fwaas_dashboard_git_repo: https://opendev.org/openstack/neutron-fwaas-dashboard
-neutron_fwaas_dashboard_git_install_branch: a3790e7a169c64059c7729dcaf88485a13fc018e  # HEAD as of 17.10.2019
+neutron_fwaas_dashboard_git_install_branch: cfb63bbb896f2ac8aaf3a2c1c3557df3ada6997a  # HEAD as of 24.10.2019
 neutron_fwaas_dashboard_git_project_group: horizon_all
-neutron_fwaas_dashboard_git_track_branch: stable/train
+neutron_fwaas_dashboard_git_track_branch: master

 ## Horizon Sahara dashboard plugin
 sahara_dashboard_git_repo: https://opendev.org/openstack/sahara-dashboard
-sahara_dashboard_git_install_branch: 7ab456bff11e14ffdbbcd0c65998e4e135f6fa86 # HEAD as of 17.10.2019
+sahara_dashboard_git_install_branch: 5199f8a58d76ab42c7c35bcb6f3e2aa1db5de851 # HEAD as of 24.10.2019
 sahara_dashboard_git_project_group: horizon_all
-sahara_dashboard_git_track_branch: stable/train
+sahara_dashboard_git_track_branch: master


 ## Keystone service
 keystone_git_repo: https://opendev.org/openstack/keystone
-keystone_git_install_branch: 0f6c6061b3026dc7a33bffad20848ebd3341af4b  # HEAD as of 17.10.2019
+keystone_git_install_branch: 7d4904c1ac55e411cb220a823b1d301ba2b99323  # HEAD as of 24.10.2019
 keystone_git_project_group: keystone_all
-keystone_git_track_branch: stable/train
+keystone_git_track_branch: master


 ## Manila service
 manila_git_repo: https://opendev.org/openstack/manila
-manila_git_install_branch: ad60658a7ca93619afe9a7683ecf8c84bf7f2e4b  # HEAD as of 17.10.2019
+manila_git_install_branch: de89e124891e7a1e4709cfb91ec701554a716906  # HEAD as of 24.10.2019
 manila_git_project_group: manila_all
-manila_git_track_branch: stable/train
+manila_git_track_branch: master


 ## Neutron service
 neutron_git_repo: https://opendev.org/openstack/neutron
-neutron_git_install_branch: 54c8943ab5a6b980212d9c4c94173dc6b41dc78d  # HEAD as of 17.10.2019
+neutron_git_install_branch: 3bddc2ebb6897b17ed50999fda528d7a2a480199  # HEAD as of 24.10.2019
 neutron_git_project_group: neutron_all
-neutron_git_track_branch: stable/train
+neutron_git_track_branch: master

 neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas
-neutron_vpnaas_git_install_branch: d16083786341308b9d8dbe173ae920bc1b9396c9  # HEAD as of 17.10.2019
+neutron_vpnaas_git_install_branch: 76356f950d02e4324681a5da7025de045c6814be  # HEAD as of 24.10.2019
 neutron_vpnaas_git_project_group: neutron_all
-neutron_vpnaas_git_track_branch: stable/train
+neutron_vpnaas_git_track_branch: master

 neutron_fwaas_git_repo: https://opendev.org/openstack/neutron-fwaas
-neutron_fwaas_git_install_branch: 22d5255c2b9b65d0c553e2ae2fb3f9bb01a7c04c  # HEAD as of 17.10.2019
+neutron_fwaas_git_install_branch: b76709009155131b933b2adc7608165413572d71  # HEAD as of 24.10.2019
 neutron_fwaas_git_project_group: neutron_all
-neutron_fwaas_git_track_branch: stable/train
+neutron_fwaas_git_track_branch: master

 neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing
-neutron_dynamic_routing_git_install_branch: c2cf1cd0671d2f658499e2874c484710c61ad741  # HEAD as of 17.10.2019
+neutron_dynamic_routing_git_install_branch: 6e02b025eadf2b300e1f521205758422c9667610  # HEAD as of 24.10.2019
 neutron_dynamic_routing_git_project_group: neutron_all
-neutron_dynamic_routing_git_track_branch: stable/train
+neutron_dynamic_routing_git_track_branch: master

 # Networking calico follows master
 networking_calico_git_repo: https://opendev.org/openstack/networking-calico
-networking_calico_git_install_branch: 79bdf4995d102833d23479180350216fc59e4b94  # HEAD as of 17.10.2019
+networking_calico_git_install_branch: 6a7caabdd3871e2f09ec6c89d0d45920b6520da0  # HEAD as of 24.10.2019
 networking_calico_git_project_group: neutron_all
 networking_calico_git_track_branch: master

 networking_odl_git_repo: https://opendev.org/openstack/networking-odl
-networking_odl_git_install_branch: 8efa1b38fe355887576782b756b9aec9f647a574  # HEAD as of 17.10.2019
+networking_odl_git_install_branch: 9639f57a43765c9b5a20600ac339d7727df6e35d  # HEAD as of 24.10.2019
 networking_odl_git_project_group: neutron_all
-networking_odl_git_track_branch: stable/train
+networking_odl_git_track_branch: master

 networking_ovn_git_repo: https://opendev.org/openstack/networking-ovn
-networking_ovn_git_install_branch: d5aef910156bf3ed3d36aeee151c0642aa7fde81  # HEAD as of 17.10.2019
+networking_ovn_git_install_branch: 4f64542bbbb86e4277d4ad6083e01df86a8248a4  # HEAD as of 24.10.2019
 networking_ovn_git_project_group: neutron_all
-networking_ovn_git_track_branch: stable/train
+networking_ovn_git_track_branch: master

 # BGPVPN is frozen until further notice due to
 # https://github.com/openstack/networking-bgpvpn/commit/e9a0ea199b47f76f69545e04bdb4db44869c388b#diff-b4ef698db8ca845e5845c4618278f29a
@ -193,62 +193,62 @@ networking_bgpvpn_git_project_group: neutron_all
 networking_bgpvpn_git_track_branch: None

 networking_sfc_git_repo: https://opendev.org/openstack/networking-sfc
-networking_sfc_git_install_branch: 699eafdf8352bcf07852af7f57b4b5c2f83e508a  # HEAD as of 17.10.2019
+networking_sfc_git_install_branch: 42c907473df9bc182ce9392e4c23d3f9b829034f  # HEAD as of 24.10.2019
 networking_sfc_git_project_group: neutron_all
-networking_sfc_git_track_branch: stable/train
+networking_sfc_git_track_branch: master


 ## Nova service
 nova_git_repo: https://opendev.org/openstack/nova
-nova_git_install_branch: 875826df959bf953609aa66d793793afa5ad618a  # HEAD as of 17.10.2019
+nova_git_install_branch: 1bfa4626d13d0a73e63745cc4a864ae86d490daf  # HEAD as of 24.10.2019
 nova_git_project_group: nova_all
-nova_git_track_branch: stable/train
+nova_git_track_branch: master


 ## Sahara service
 sahara_git_repo: https://opendev.org/openstack/sahara
-sahara_git_install_branch: 8501b5235cb4c4d23eba796f201eace350e08bf2 # HEAD as of 17.10.2019
+sahara_git_install_branch: 810d94bfbb1ffa0c68949c3180dadfab333fb4cd # HEAD as of 24.10.2019
 sahara_git_project_group: sahara_all
-sahara_git_track_branch: stable/train
+sahara_git_track_branch: master


 ## Swift service
 swift_git_repo: https://opendev.org/openstack/swift
-swift_git_install_branch: fe5433da3c152c9463e66efe389b0393b43061c6 # HEAD as of 17.10.2019
+swift_git_install_branch: 739c3704107bd991493472c18bfe7ac5f933077c # HEAD as of 24.10.2019
 swift_git_project_group: swift_all
-swift_git_track_branch: stable/train
+swift_git_track_branch: master


 ## Ironic service
 ironic_git_repo: https://opendev.org/openstack/ironic
-ironic_git_install_branch: 178d4e6fb791a9e36652908f285fd8984536eabe  # HEAD as of 17.10.2019
+ironic_git_install_branch: 0f95848d6f8e98f4ec7d9bddec19e269daa35e28  # HEAD as of 24.10.2019
 ironic_git_project_group: ironic_all
-ironic_git_track_branch: stable/train
+ironic_git_track_branch: master


 ## Magnum service
 magnum_git_repo: https://opendev.org/openstack/magnum
-magnum_git_install_branch: b449ed8964ce06cc89ba26c26da63f10ee57a98a  # HEAD as of 17.10.2019
+magnum_git_install_branch: 476b18fd5e1c5b3287d761a1b399f53298aba046  # HEAD as of 24.10.2019
 magnum_git_project_group: magnum_all
-magnum_git_track_branch: stable/train
+magnum_git_track_branch: master

 ## Masakari service
 masakari_git_repo: https://opendev.org/openstack/masakari
-masakari_git_install_branch: 81488bac200d7c3cc6c535b1079bce5de565424b  # HEAD as of 17.10.2019
+masakari_git_install_branch: 596b3d142eeea935fb2293de5631cd9dd4c191c6  # HEAD as of 24.10.2019
 masakari_git_project_group: masakari_api
-masakari_git_track_branch: stable/train
+masakari_git_track_branch: master

 ## Masakari monitors services
 masakari_monitors_git_repo: https://opendev.org/openstack/masakari-monitors
-masakari_monitors_git_install_branch: b02c6b6931c0256f4ce6d7167c97ebb849ff3453  # HEAD as of 17.10.2019
+masakari_monitors_git_install_branch: b717be163e96dfd7363885a937f05197be3530b1  # HEAD as of 24.10.2019
 masakari_monitors_git_project_group: masakari_monitor
-masakari_monitors_git_track_branch: stable/train
+masakari_monitors_git_track_branch: master

 ## Mistral service
 mistral_git_repo: https://opendev.org/openstack/mistral
-mistral_git_install_branch: 5d387db6c2a53e3c28d46ffd7da45cf1f52a3d8b  # HEAD as of 17.10.2019
+mistral_git_install_branch: dfcd058144b46ce39a5f53036b31d1a77d85aad9  # HEAD as of 24.10.2019
 mistral_git_project_group: mistral_all
-mistral_git_track_branch: stable/train
+mistral_git_track_branch: master

 ## Murano service
 murano_git_repo: https://opendev.org/openstack/murano
@ -258,67 +258,67 @@ murano_git_track_branch: master

 ## Trove service
 trove_git_repo: https://opendev.org/openstack/trove
-trove_git_install_branch: 09e3a53737e4b97ce1d617315419d690bbc1e8d8 # HEAD as of 17.10.2019
+trove_git_install_branch: bdd44790fb10b20a7ef4ceed161bb2ca0e4f5c48 # HEAD as of 24.10.2019
 trove_git_project_group: trove_all
-trove_git_track_branch: stable/train
+trove_git_track_branch: master

 ## Horizon Trove dashboard plugin
 trove_dashboard_git_repo: https://opendev.org/openstack/trove-dashboard
-trove_dashboard_git_install_branch: 5035eaed0e5dba7abcc6cf36db529c4556fa7409 # HEAD as of 17.10.2019
+trove_dashboard_git_install_branch: 2bae009ec2a59737c33b987bd141d86f1d49cc89 # HEAD as of 24.10.2019
 trove_dashboard_git_project_group: horizon_all
-trove_dashboard_git_track_branch: stable/train
+trove_dashboard_git_track_branch: master


 ## Octavia service
 octavia_git_repo: https://opendev.org/openstack/octavia
-octavia_git_install_branch: 6f54167b05cab1ef2721d63ddee99f92d61ea14f  # HEAD as of 17.10.2019
+octavia_git_install_branch: 93a7116b547e7861b2bb93a362cc0f7e2787b6db  # HEAD as of 24.10.2019
 octavia_git_project_group: octavia_all
-octavia_git_track_branch: stable/train
+octavia_git_track_branch: master


 ## Panko service
 panko_git_repo: https://opendev.org/openstack/panko
-panko_git_install_branch: 9b551e7a4501a5d5109adc55cc9cf8c314444d0c  # HEAD as of 17.10.2019
+panko_git_install_branch: 59245276791dcc275aec10aa002ccd645d1afd69  # HEAD as of 24.10.2019
 panko_git_project_group: panko_all
-panko_git_track_branch: stable/train
+panko_git_track_branch: master


 ## Placement service
 placement_git_repo: https://opendev.org/openstack/placement
-placement_git_install_branch: 36beddbaf5e3cc4dce8e3abda5471fe95704feae  # HEAD as of 17.10.2019
+placement_git_install_branch: 2a665b5d995452af1858373304a05c67c01cc6bb  # HEAD as of 24.10.2019
 placement_git_project_group: placement_all
-placement_git_track_branch: stable/train
+placement_git_track_branch: master


 ## Tacker service
 tacker_git_repo: https://opendev.org/openstack/tacker
-tacker_git_install_branch: 36c965004873459973419dab15d6744047340291 # HEAD as of 17.10.2019
+tacker_git_install_branch: b320839d7360856657065cd8a7cf144dc6220ee8 # HEAD as of 24.10.2019
 tacker_git_project_group: tacker_all
-tacker_git_track_branch: stable/train
+tacker_git_track_branch: master


 ## Congress service
 congress_git_repo: https://opendev.org/openstack/congress
-congress_git_install_branch: 6c524a752706c60cc97418f71e22bd9de2f6cb70  # HEAD as of 17.10.2019
+congress_git_install_branch: c0b105fe34e5ed69600eb695bbd4da1641d70fd2  # HEAD as of 24.10.2019
 congress_git_package_name: openstack-congress
 congress_git_project_group: congress_all
-congress_git_track_branch: stable/train
+congress_git_track_branch: master

 ## Horizon Octavia dashboard plugin
 octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard
-octavia_dashboard_git_install_branch: d515a7450bf229222358045a57301c2778f18344  # HEAD as of 17.10.2019
+octavia_dashboard_git_install_branch: e64eef34ebea63998c3816ec9541e575b8cb2c85  # HEAD as of 24.10.2019
 octavia_dashboard_git_project_group: horizon_all
-octavia_dashboard_git_track_branch: stable/train
+octavia_dashboard_git_track_branch: master


 ## Blazar service
 blazar_git_repo: https://opendev.org/openstack/blazar
-blazar_git_install_branch: 835001a26dd4fb8634528d0a15eb1b42d2d0ce7a  # HEAD as of 17.10.2019
+blazar_git_install_branch: 651f52be5998ec7b82c65975c854a562890ae602  # HEAD as of 24.10.2019
 blazar_git_project_group: blazar_all
-blazar_git_track_branch: stable/train
+blazar_git_track_branch: master

 ## Blazar Nova Service
 blazar_nova_git_repo: https://opendev.org/openstack/blazar-nova
-blazar_nova_git_install_branch: 48579dd44794810f8f3eafe18de6b73569483086  # HEAD as of 17.10.2019
+blazar_nova_git_install_branch: 4856c7209f5e227828073b2da1fd07c44137b373  # HEAD as of 24.10.2019
 blazar_nova_git_project_group: blazar_all
-blazar_nova_git_track_branch: stable/train
+blazar_nova_git_track_branch: master
--- a/playbooks/defaults/repo_packages/openstack_testing.yml
+++ b/playbooks/defaults/repo_packages/openstack_testing.yml
@ -0,0 +1,22 @@
+---
+# Copyright 2018, Jean-Philippe Evrard <jean-philippe@evrard.me>
+#
+# 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.
+
+# TODO(evrardjp): Remove this file from stable branches to allow the latest tempest
+# release to be used instead, when a PyPI published version of tempest contains
+# https://github.com/openstack/tempest/commit/7d2b636a30057ed8db8cfd4fe2248f509b3570f1#diff-5c9acbc10dc9d27b47985cd74ab100f6
+tempest_git_repo: https://opendev.org/openstack/tempest
+tempest_git_install_branch: 52d7083f76c3b48650a7e6cda5fdad03332b51ed  # HEAD as of 24.10.2019
+tempest_git_project_group: utility_all
+tempest_git_track_branch: master
--- a/playbooks/os-tempest-install.yml
+++ b/playbooks/os-tempest-install.yml
@ -18,6 +18,7 @@
  gather_facts: "{{ osa_gather_facts | default(True) }}"
  user: root
  vars_files:
+    - "defaults/repo_packages/openstack_testing.yml"
    - "defaults/{{ install_method }}_install.yml"
  pre_tasks:
    - name: End playbook