Merge "Track master branch for Train cycle"

2019-04-29 08:59:53 +00:00 · 2019-04-29 08:59:53 +00:00 · 8492e93c1f
commit 8492e93c1f
parent d46184cbd2 091456a02d
1 changed files with 42 additions and 42 deletions
--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@ -32,56 +32,56 @@
 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
 requirements_git_install_branch: af41b096a5a0852a15c3989ec48b956433c47873 # HEAD as of 29.03.2019
-requirements_git_track_branch: stable/stein
+requirements_git_track_branch: master
 ## Aodh service
 aodh_git_repo: https://git.openstack.org/openstack/aodh
 aodh_git_install_branch: 1b552dd82565157c123925adecd12fc279cbbee0 # HEAD as of 29.03.2019
 aodh_git_project_group: aodh_all
-aodh_git_track_branch: stable/stein
+aodh_git_track_branch: master
 ## Barbican service
 barbican_git_repo: https://git.openstack.org/openstack/barbican
 barbican_git_install_branch: 4c0ddda941289fba8e5ec4341b5d02d155d46162 # HEAD as of 29.03.2019
 barbican_git_project_group: barbican_all
-barbican_git_track_branch: stable/stein
+barbican_git_track_branch: master
 ## Ceilometer service
 ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
 ceilometer_git_install_branch: 062e02c612d1fdd8c40b9209319b32e04489c163 # HEAD as of 29.03.2019
 ceilometer_git_project_group: all
-ceilometer_git_track_branch: stable/stein
+ceilometer_git_track_branch: master
 ## Cinder service
 cinder_git_repo: https://git.openstack.org/openstack/cinder
 cinder_git_install_branch: 46363697d9a7ddc7880bf6071e5d035f3f9aa043 # HEAD as of 29.03.2019
 cinder_git_project_group: cinder_all
-cinder_git_track_branch: stable/stein
+cinder_git_track_branch: master
 ## Designate service
 designate_git_repo: https://git.openstack.org/openstack/designate
 designate_git_install_branch: f6cd521eb22d31bd41be58c2ba8a93baf619449f # HEAD as of 29.03.2019
 designate_git_project_group: designate_all
-designate_git_track_branch: stable/stein
+designate_git_track_branch: master
 ## Horizon Designate dashboard plugin
 designate_dashboard_git_repo: https://git.openstack.org/openstack/designate-dashboard
 designate_dashboard_git_install_branch: 8f655fec2ddb0a67a853b181beb97bdc3c8c8f6c # HEAD as of 29.03.2019
 designate_dashboard_git_project_group: horizon_all
-designate_dashboard_git_track_branch: stable/stein
+designate_dashboard_git_track_branch: master
 ## Glance service
 glance_git_repo: https://git.openstack.org/openstack/glance
 glance_git_install_branch: eb791412b5b7bfc3f6df9cefa2808938d543e908 # HEAD as of 29.03.2019
 glance_git_project_group: glance_all
-glance_git_track_branch: stable/stein
+glance_git_track_branch: master
 ## Heat service
@ -89,7 +89,7 @@ heat_git_repo: https://git.openstack.org/openstack/heat
 heat_git_install_branch: 5528c47fad8262adbd11f8590a1550b181c061e0 # HEAD as of 29.03.2019
 heat_git_package_name: openstack-heat
 heat_git_project_group: heat_all
-heat_git_track_branch: stable/stein
+heat_git_track_branch: master
 ## Horizon Heat dashboard plugin
 heat_dashboard_git_repo: https://git.openstack.org/openstack/heat-dashboard
@ -101,19 +101,19 @@ heat_dashboard_git_track_branch: master # Not branched yet
 horizon_git_repo: https://git.openstack.org/openstack/horizon
 horizon_git_install_branch: 88b27dddedd3123c3f5aa6abfefddd2bd6e3461f # HEAD as of 29.03.2019
 horizon_git_project_group: horizon_all
-horizon_git_track_branch: stable/stein
+horizon_git_track_branch: master
 ## Horizon Ironic dashboard plugin
 ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui
 ironic_dashboard_git_install_branch: f725cd6b3ad5ba63bdf71a4bd963f5bc55e96b2e # HEAD as of 29.03.2019
 ironic_dashboard_git_project_group: horizon_all
-ironic_dashboard_git_track_branch: stable/stein
+ironic_dashboard_git_track_branch: master
 ## Horizon Magnum dashboard plugin
 magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui
 magnum_dashboard_git_install_branch: 1ead69705498ad9023f4d0c56d69a1a5910fe91e # HEAD as of 29.03.2019
 magnum_dashboard_git_project_group: horizon_all
-magnum_dashboard_git_track_branch: stable/stein
+magnum_dashboard_git_track_branch: master
 ## Horizon Masakari dashboard plugin
 masakari_dashboard_git_repo: https://git.openstack.org/openstack/masakari-dashboard
@ -125,26 +125,26 @@ masakari_dashboard_git_track_branch: master # Not branched yet
 neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard
 neutron_lbaas_dashboard_git_install_branch: ae51e99b03306f256e330e9480b72ae6e7f91535 # HEAD as of 29.03.2019
 neutron_lbaas_dashboard_git_project_group: horizon_all
-neutron_lbaas_dashboard_git_track_branch: stable/stein
+neutron_lbaas_dashboard_git_track_branch: master
 ## Horizon FWaaS dashboard plugin
 neutron_fwaas_dashboard_git_repo: https://git.openstack.org//openstack/neutron-fwaas-dashboard
 neutron_fwaas_dashboard_git_install_branch: 87b27591dc79552166f2410ae0efda36f1ff2b8d # HEAD as of 29.03.2019
 neutron_fwaas_dashboard_git_project_group: horizon_all
-neutron_fwaas_dashboard_git_track_branch: stable/stein
+neutron_fwaas_dashboard_git_track_branch: master
 ## Horizon Sahara dashboard plugin
 sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard
 sahara_dashboard_git_install_branch: 775c953716eaa7a1b48ce69f111113e103a27ecf # HEAD as of 29.03.2019
 sahara_dashboard_git_project_group: horizon_all
-sahara_dashboard_git_track_branch: stable/stein
+sahara_dashboard_git_track_branch: master
 ## Keystone service
 keystone_git_repo: https://git.openstack.org/openstack/keystone
 keystone_git_install_branch: eaa3e4e3bc15c7e342aa0574768d65aa5f5cb81c # HEAD as of 29.03.2019
 keystone_git_project_group: keystone_all
-keystone_git_track_branch: stable/stein
+keystone_git_track_branch: master
 ## Manila service
@ -158,27 +158,27 @@ manila_git_track_branch: master
 neutron_git_repo: https://git.openstack.org/openstack/neutron
 neutron_git_install_branch: 4da4d5e0f0c2eb49b8929119776d16504229a4c3 # HEAD as of 29.03.2019
 neutron_git_project_group: neutron_all
-neutron_git_track_branch: stable/stein
+neutron_git_track_branch: master
 neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
 neutron_lbaas_git_install_branch: e21efe39f2bab37838ad0c00d637ab88b609e822  # HEAD as of 29.03.2019
 neutron_lbaas_git_project_group: neutron_all
-neutron_lbaas_git_track_branch: stable/stein
+neutron_lbaas_git_track_branch: master
 neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
 neutron_vpnaas_git_install_branch: acf8d1948570a2092629b5ee97d418e9153b3877  # HEAD as of 29.03.2019
 neutron_vpnaas_git_project_group: neutron_all
-neutron_vpnaas_git_track_branch: stable/stein
+neutron_vpnaas_git_track_branch: master
 neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
 neutron_fwaas_git_install_branch: 4a8687e3f36061735064a89a2f9401bfa94e992e  # HEAD as of 29.03.2019
 neutron_fwaas_git_project_group: neutron_all
-neutron_fwaas_git_track_branch: stable/stein
+neutron_fwaas_git_track_branch: master
 neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing
 neutron_dynamic_routing_git_install_branch: c27bb1f190a60d201d616bebd42c60dae6afa545  # HEAD as of 29.03.2019
 neutron_dynamic_routing_git_project_group: neutron_all
-neutron_dynamic_routing_git_track_branch: stable/stein
+neutron_dynamic_routing_git_track_branch: master
 # Networking calico follows master
 networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
@ -189,38 +189,38 @@ networking_calico_git_track_branch: master
 networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl
 networking_odl_git_install_branch: d4373026e9be1bccd70369b806d9ccba8a500eaf  # HEAD as of 29.03.2019
 networking_odl_git_project_group: neutron_all
-networking_odl_git_track_branch: stable/stein
+networking_odl_git_track_branch: master
 networking_ovn_git_repo: https://git.openstack.org/openstack/networking-ovn
 networking_ovn_git_install_branch: 71450fc93d666b0a8ddc0c141bfd803730b44815  # HEAD as of 29.03.2019
 networking_ovn_git_project_group: neutron_all
-networking_ovn_git_track_branch: stable/stein
+networking_ovn_git_track_branch: master
 # BGPVPN is frozen until further notice due to
 # https://github.com/openstack/networking-bgpvpn/commit/e9a0ea199b47f76f69545e04bdb4db44869c388b#diff-b4ef698db8ca845e5845c4618278f29a
 networking_bgpvpn_git_repo: https://git.openstack.org/openstack/networking-bgpvpn
-networking_bgpvpn_git_install_branch: 3b93ddacd390d92fb144e5660324d4da064ad9a4 # FROZEN HEAD of "stable/stein" as of 31.03.2018
+networking_bgpvpn_git_install_branch: 3b93ddacd390d92fb144e5660324d4da064ad9a4 # FROZEN HEAD of "master" as of 31.03.2018
 networking_bgpvpn_git_project_group: neutron_all
 networking_bgpvpn_git_track_branch: None
 networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc
 networking_sfc_git_install_branch: 5ea96a1c85710fb24f860267042fd52e64b59c87  # HEAD as of 29.03.2019
 networking_sfc_git_project_group: neutron_all
-networking_sfc_git_track_branch: stable/stein
+networking_sfc_git_track_branch: master
 ## Nova service
 nova_git_repo: https://git.openstack.org/openstack/nova
 nova_git_install_branch: e4857b98573bb5b50797298886399c5c37ab3eba # HEAD as of 29.03.2019
 nova_git_project_group: nova_all
-nova_git_track_branch: stable/stein
+nova_git_track_branch: master
 ## PowerVM Virt Driver
 nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm
 nova_powervm_git_install_branch: 5104bc6e4c68523f0cf52bbd304cc54c4eff0938 # HEAD as of 29.03.2019
 nova_powervm_git_project_group: nova_all
-nova_powervm_git_track_branch: stable/stein
+nova_powervm_git_track_branch: master
 ## LXD Virt Driver
@ -234,65 +234,65 @@ nova_lxd_git_track_branch: master # Not branched yet
 sahara_git_repo: https://git.openstack.org/openstack/sahara
 sahara_git_install_branch: aa8596d03eb2f955636aea9fa848a5a1723755ff # HEAD as of 29.03.2019
 sahara_git_project_group: sahara_all
-sahara_git_track_branch: stable/stein
+sahara_git_track_branch: master
 ## Swift service
 swift_git_repo: https://git.openstack.org/openstack/swift
 swift_git_install_branch: 7702df8caf441503acff9c052f3e34eeb6462bb0 # HEAD as of 29.03.2019
 swift_git_project_group: swift_all
-swift_git_track_branch: stable/stein
+swift_git_track_branch: master
 ## Ironic service
 ironic_git_repo: https://git.openstack.org/openstack/ironic
 ironic_git_install_branch: 5c1f2d102942e9f4d946cfaaf747e4d551b237a8 # HEAD as of 29.03.2019
 ironic_git_project_group: ironic_all
-ironic_git_track_branch: stable/stein
+ironic_git_track_branch: master
 ## Magnum service
 magnum_git_repo: https://git.openstack.org/openstack/magnum
 magnum_git_install_branch: 18ce317d025842643aa5e786b99154b1fc16641f # HEAD as of 29.03.2019
 magnum_git_project_group: magnum_all
-magnum_git_track_branch: stable/stein
+magnum_git_track_branch: master
 ## Masakari service
 masakari_git_repo: https://git.openstack.org/openstack/masakari
 masakari_git_install_branch: 150a835d95e599471e965ad75bb8ec817d93b46d # HEAD as of 29.03.2019
 masakari_git_project_group: masakari_api
-masakari_git_track_branch: stable/stein
+masakari_git_track_branch: master
 ## Masakari monitors services
 masakari_monitors_git_repo: https://git.openstack.org/openstack/masakari-monitors
 masakari_monitors_git_install_branch: 5b338058abfdc5066eba375e182932f5e0f7436f # HEAD as of 29.03.2019
 masakari_monitors_git_project_group: masakari_monitor
-masakari_monitors_git_track_branch: stable/stein
+masakari_monitors_git_track_branch: master
 ## Mistral service
 mistral_git_repo: https://git.openstack.org/openstack/mistral
 mistral_git_install_branch: 5b7151b946bdf571ca25816fe36a680dc446b5e4 # HEAD as of 29.03.2019
 mistral_git_project_group: mistral_all
-mistral_git_track_branch: stable/stein
+mistral_git_track_branch: master
 ## Trove service
 trove_git_repo: https://git.openstack.org/openstack/trove
 trove_git_install_branch: 75784f94b1411a325ab3bdff4c71d2e5aa2abc2b # HEAD as of 29.03.2019
 trove_git_project_group: trove_all
-trove_git_track_branch: stable/stein
+trove_git_track_branch: master
 ## Horizon Trove dashboard plugin
 trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard
 trove_dashboard_git_install_branch: cc11fc13ee1d1a1688031de9145025afe06ccbce # HEAD as of 29.03.2019
 trove_dashboard_git_project_group: horizon_all
-trove_dashboard_git_track_branch: stable/stein
+trove_dashboard_git_track_branch: master
 ## Octavia service
 octavia_git_repo: https://git.openstack.org/openstack/octavia
 octavia_git_install_branch: 80bfa259f4a6a71ecd077b452993e83dc9ab501a # HEAD as of 29.03.2019
 octavia_git_project_group: octavia_all
-octavia_git_track_branch: stable/stein
+octavia_git_track_branch: master
 ## Panko service
@ -306,7 +306,7 @@ panko_git_track_branch: master
 tacker_git_repo: https://git.openstack.org/openstack/tacker
 tacker_git_install_branch: dc4343bda48cb52b63840cd16470ba3ff9460151 # HEAD as of 29.03.2019
 tacker_git_project_group: tacker_all
-tacker_git_track_branch: stable/stein
+tacker_git_track_branch: master
 ## Congress service
@ -314,23 +314,23 @@ congress_git_repo: https://git.openstack.org/openstack/congress
 congress_git_install_branch: 030eed8c5519d44a69b3b458cf5169086852ae0d # HEAD as of 29.03.2019
 congress_git_package_name: openstack-congress
 congress_git_project_group: congress_all
-congress_git_track_branch: stable/stein
+congress_git_track_branch: master
 ## Horizon Octavia dashboard plugin
 octavia_dashboard_git_repo: https://git.openstack.org/openstack/octavia-dashboard
 octavia_dashboard_git_install_branch: 73fae9959293c92919bacca89af32ccf0df32c51 # HEAD as of 29.03.2019
 octavia_dashboard_git_project_group: horizon_all
-octavia_dashboard_git_track_branch: stable/stein
+octavia_dashboard_git_track_branch: master
 ## Blazar service
 blazar_git_repo: https://git.openstack.org/openstack/blazar
 blazar_git_install_branch: 6e6ffeb52906ec25ce60799bd513d486003a6802 # HEAD as of 29.03.2019
 blazar_git_project_group: blazar_all
-blazar_git_track_branch: stable/stein
+blazar_git_track_branch: master
 ## Blazar Nova Service
 blazar_nova_git_repo: https://git.openstack.org/openstack/blazar-nova
 blazar_nova_git_install_branch: 5a220faf92ea2c1ff5b5b334435b2b80d4d34490 # HEAD as of 29.03.2019
 blazar_nova_git_project_group: blazar_all
-blazar_nova_git_track_branch: stable/stein
+blazar_nova_git_track_branch: master