diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt index fd401854c2..5c73cce532 100644 --- a/global-requirement-pins.txt +++ b/global-requirement-pins.txt @@ -9,6 +9,6 @@ ### These are pinned to ensure exactly the same behaviour forever! ### ### These pins are updated through the sources-branch-updater script ### ### -pip==9.0.1 -setuptools==38.5.1 +pip==9.0.3 +setuptools==39.0.1 wheel==0.30.0 diff --git a/inventory/group_vars/all/all.yml b/inventory/group_vars/all/all.yml index 5742da43de..835e2e2e5d 100644 --- a/inventory/group_vars/all/all.yml +++ b/inventory/group_vars/all/all.yml @@ -14,7 +14,7 @@ # limitations under the License. ## OpenStack Source Code Release -openstack_release: master +openstack_release: 18.0.0.0b1 ## Verbosity Options debug: False diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/playbooks/defaults/repo_packages/gnocchi.yml index 9f259019bc..e0961504e8 100644 --- a/playbooks/defaults/repo_packages/gnocchi.yml +++ b/playbooks/defaults/repo_packages/gnocchi.yml @@ -33,5 +33,5 @@ ## This service has a different stable branch strategy to the rest of OpenStack. ## The SHA is recorded here to make the SHA updating easier. gnocchi_git_repo: https://github.com/gnocchixyz/gnocchi -gnocchi_git_install_branch: d4a4accbe5f37469a4f742d0207d364cadb10978 # HEAD of "master" as of 16.02.2018 +gnocchi_git_install_branch: 51ac20f06690f54933fb6f84ba3353ea0eae5170 # HEAD of "master" as of 31.03.2018 gnocchi_git_project_group: gnocchi_all diff --git a/playbooks/defaults/repo_packages/nova_consoles.yml b/playbooks/defaults/repo_packages/nova_consoles.yml index a9c0312375..cec194cff2 100644 --- a/playbooks/defaults/repo_packages/nova_consoles.yml +++ b/playbooks/defaults/repo_packages/nova_consoles.yml @@ -27,11 +27,11 @@ ## NOVNC from source novncproxy_git_repo: https://github.com/novnc/noVNC -novncproxy_git_install_branch: 37b4d13db81e0e80e117c07b86ff98714c7b6b1a # HEAD of "master" as of 16.02.2018 +novncproxy_git_install_branch: 7d60e97cc98ed9462f1ae4da5b6c3f3a85cf981b # HEAD of "master" as of 31.03.2018 novncproxy_git_project_group: nova_console ## spice-html5 from source spicehtml5_git_repo: https://github.com/SPICE/spice-html5 -spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 16.02.2018 +spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 31.03.2018 spicehtml5_git_project_group: nova_console diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 9fac323826..cd23ce54f1 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,220 +31,226 @@ ## Global Requirements requirements_git_repo: https://git.openstack.org/openstack/requirements -requirements_git_install_branch: 83dbef854e3b2b699f9382a993997a94bba1f5cb # HEAD of "master" as of 16.02.2018 +requirements_git_install_branch: 424d60b9c94bcf9b674794b1ec739f8cb0c0978b # HEAD of "master" as of 31.03.2018 ## Aodh service aodh_git_repo: https://git.openstack.org/openstack/aodh -aodh_git_install_branch: a1e60be0b8018fea95f2c0020545d0e6cd63fdbf # HEAD of "master" as of 16.02.2018 +aodh_git_install_branch: e99c6f3e8ce6195323ccf2f3560d83561e0c861b # HEAD of "master" as of 31.03.2018 aodh_git_project_group: aodh_all ## Barbican service barbican_git_repo: https://git.openstack.org/openstack/barbican -barbican_git_install_branch: 5b525f6b0a7cf5342a9ffa3ca3618028d6d53649 # HEAD of "master" as of 16.02.2018 +barbican_git_install_branch: b33fed4e5faca37f180b9e1988c044991da4accf # HEAD of "master" as of 31.03.2018 barbican_git_project_group: barbican_all ## Ceilometer service ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer -ceilometer_git_install_branch: d2af7e9ece2f903633bf4e95208b2e3ba6ac464d # HEAD of "master" as of 16.02.2018 +ceilometer_git_install_branch: 334109564538f1b0eec47ab0b33cd2b5be39d8a9 # HEAD of "master" as of 31.03.2018 ceilometer_git_project_group: ceilometer_all ## Cinder service cinder_git_repo: https://git.openstack.org/openstack/cinder -cinder_git_install_branch: 949309e06b85a068696b9844a8c9dac29874e9c9 # HEAD of "master" as of 16.02.2018 +cinder_git_install_branch: 902719a46ed9b8f84f9753bd624ad59b5a968134 # HEAD of "master" as of 31.03.2018 cinder_git_project_group: cinder_all ## Designate service designate_git_repo: https://git.openstack.org/openstack/designate -designate_git_install_branch: 5afe39986a8f52c272d571f67a04f472171efb68 # HEAD of "master" as of 16.02.2018 +designate_git_install_branch: 7a2adab56a922640cc47ecfdf83cd8f8209fca64 # HEAD of "master" as of 31.03.2018 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: ba2393d1a5fd2143255ca48cdd642c296536c722 # HEAD of "master" as of 16.02.2018 +designate_dashboard_git_install_branch: 9d1c5d7e089383910d1a4374bf22cc89bb991b4d # HEAD of "master" as of 31.03.2018 designate_dashboard_git_project_group: horizon_all ## Dragonflow service dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow -dragonflow_git_install_branch: 5108c1979487ea7e0287daf343c38a383c196ba8 # HEAD of "master" as of 16.02.2018 +dragonflow_git_install_branch: a5804afcb90f0b1029f8d091a0532a05a2001250 # HEAD of "master" as of 31.03.2018 dragonflow_git_project_group: neutron_all ## Glance service glance_git_repo: https://git.openstack.org/openstack/glance -glance_git_install_branch: 3d5f33f2b3270e89e51fbbd8696a68469dd7f00b # HEAD of "master" as of 16.02.2018 +glance_git_install_branch: 06158f69b989d64ab17584fbe630a314e7d279a9 # HEAD of "master" as of 31.03.2018 glance_git_project_group: glance_all ## Heat service heat_git_repo: https://git.openstack.org/openstack/heat -heat_git_install_branch: 7dbce7a8bb238907244a5a0deea352785dee0f19 # HEAD of "master" as of 16.02.2018 +heat_git_install_branch: 71a961bcd548a3fcccbb97448503e7568d87f4a8 # HEAD of "master" as of 31.03.2018 heat_git_project_group: heat_all +## Horizon Heat dashboard plugin +heat_dashboard_git_repo: https://git.openstack.org/openstack/heat-dashboard +heat_dashboard_git_install_branch: e69e115ef40150bb08025df9e861bcc10b0ff6a6 # HEAD of "master" as of 31.03.2018 +heat_dashboard_git_project_group: horizon_all ## Horizon service horizon_git_repo: https://git.openstack.org/openstack/horizon -horizon_git_install_branch: 5c5159bc091a52fb5a952263605dfa0c6d3f3883 # HEAD of "master" as of 16.02.2018 +horizon_git_install_branch: 946ecea7b707d49b5ce5d56204aaf6073d33967e # HEAD of "master" as of 31.03.2018 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: 931996a268b1c7a41468f6402dc277928a7866ea # HEAD of "master" as of 16.02.2018 +ironic_dashboard_git_install_branch: f1f11d53d7eea079077873b060bee735ea9225d8 # HEAD of "master" as of 31.03.2018 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: f5cd4c0395021bd0b1357e17dc7eaea392d1bc6b # HEAD of "master" as of 16.02.2018 +magnum_dashboard_git_install_branch: d78285db9dabec60468bc48dd75a39ac988d7f03 # HEAD of "master" as of 31.03.2018 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: c56d3f3e2254d752cae05dbc728ab354eae101fd # HEAD of "master" as of 16.02.2018 +neutron_lbaas_dashboard_git_install_branch: e6da9ade502458258c565e36813f7d099234eba2 # HEAD of "master" as of 31.03.2018 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: 1cca9e573092196f7e89ee6ffc2a931d60551756 # HEAD of "master" as of 16.02.2018 +neutron_fwaas_dashboard_git_install_branch: f85040ff654582f61721a6767d4643783e63d9d1 # HEAD of "master" as of 31.03.2018 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: f668617202f3fa8082ef3f5f879f1d9c3e16d7bb # HEAD of "master" as of 16.02.2018 +sahara_dashboard_git_install_branch: 0f83666144b98c4267f615b0ad4b442e0d619ca5 # HEAD of "master" as of 31.03.2018 sahara_dashboard_git_project_group: horizon_all ## Keystone service keystone_git_repo: https://git.openstack.org/openstack/keystone -keystone_git_install_branch: db91bfc8c8b0a9650ef2aae0497db9c941dd207e # HEAD of "master" as of 16.02.2018 +keystone_git_install_branch: a6adc72e3e7ff4ff0bff0702e69ebd8f697d6261 # HEAD of "master" as of 31.03.2018 keystone_git_project_group: keystone_all ## Neutron service neutron_git_repo: https://git.openstack.org/openstack/neutron -neutron_git_install_branch: 91b07eabcc345ec784fd21980373106a3d167cdd # HEAD of "master" as of 16.02.2018 +neutron_git_install_branch: 44be070a3e459d6b254cf46e0c878679aa30350f # HEAD of "master" as of 31.03.2018 neutron_git_project_group: neutron_all neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas -neutron_lbaas_git_install_branch: 4ff951aef67896a0b5d097250d5206c13aba94d4 # HEAD of "master" as of 16.02.2018 +neutron_lbaas_git_install_branch: ac720b2a49720fb99e4189f93d5a83cfb295ccb3 # HEAD of "master" as of 31.03.2018 neutron_lbaas_git_project_group: neutron_all neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: 3b5f921915fd1a2f4ec8cc3ea5c8f4be643ec084 # HEAD of "master" as of 16.02.2018 +neutron_vpnaas_git_install_branch: 1f9b95d6dbe644af7ec8782ca80d54a843ded016 # HEAD of "master" as of 31.03.2018 neutron_vpnaas_git_project_group: neutron_all neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas -neutron_fwaas_git_install_branch: 3976042bef7c994758585f78472b4e65232a2b1c # HEAD of "master" as of 16.02.2018 +neutron_fwaas_git_install_branch: d9c52bcd54881d336cf1d5a74b4ed3697a1223fe # HEAD of "master" as of 31.03.2018 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: c7849e14341ce694c3037a4ba2536a5c61ca2aeb # HEAD of "master" as of 16.02.2018 +neutron_dynamic_routing_git_install_branch: 008517ea02d119a073ca76d2863f01bec964ae96 # HEAD of "master" as of 31.03.2018 neutron_dynamic_routing_git_project_group: neutron_all networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico -networking_calico_git_install_branch: cc3628125775f2f1b3c57c95db3d6b50278dc92b # HEAD of "master" as of 16.02.2018 +networking_calico_git_install_branch: ebfbf267ab12271ca68412e22a41b2c8e9c49e40 # HEAD of "master" as of 31.03.2018 networking_calico_git_project_group: neutron_all networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl -networking_odl_git_install_branch: 14bb70bd1042a525c5f274ae4775fe4c22c8e30a # HEAD of "master" as of 16.02.2018 +networking_odl_git_install_branch: 53ff740b2a78626d5b077278997bdcec6b1b0892 # HEAD of "master" as of 31.03.2018 networking_odl_git_project_group: neutron_all +# 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: c545700edcd73d340500feb9e6d7f799c262042a # HEAD of "master" as of 16.02.2018 +networking_bgpvpn_git_install_branch: 3b93ddacd390d92fb144e5660324d4da064ad9a4 # FROZEN HEAD of "master" as of 31.03.2018 networking_bgpvpn_git_project_group: neutron_all networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc -networking_sfc_git_install_branch: b1526272288151256bb50add4ef5ce2d6a6c7aa7 # HEAD of "master" as of 16.02.2018 +networking_sfc_git_install_branch: ec8272bd177d3f733286d03cb33501daede926ef # HEAD of "master" as of 31.03.2018 networking_sfc_git_project_group: neutron_all ## Nova service nova_git_repo: https://git.openstack.org/openstack/nova -nova_git_install_branch: f79d040028da6370181db3edb2259401bab951ec # HEAD of "master" as of 16.02.2018 +nova_git_install_branch: c683518ecb085a51ac0b6557edfe506ac01cbe06 # HEAD of "master" as of 31.03.2018 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: f54ab518acedda6239e11021e8d3626019600807 # HEAD of "master" as of 16.02.2018 +nova_powervm_git_install_branch: b925fcba37dc991e8b8dcbde65347a12022481dd # HEAD of "master" as of 31.03.2018 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: 16d06d149ed979745aa0ccd2b6db23122d17b57f # HEAD of "master" as of 16.02.2018 +nova_lxd_git_install_branch: 47afcf108a0fb7de234b6fa9607503541ee66184 # HEAD of "master" as of 31.03.2018 nova_lxd_git_project_group: nova_all ## Sahara service sahara_git_repo: https://git.openstack.org/openstack/sahara -sahara_git_install_branch: 7ae33f0d2495dbc97a625a36ddbd8e031267b919 # HEAD of "master" as of 16.02.2018 +sahara_git_install_branch: 6e607903154d9f1420e245098244e810a1f59497 # HEAD of "master" as of 31.03.2018 sahara_git_project_group: sahara_all ## Swift service swift_git_repo: https://git.openstack.org/openstack/swift -swift_git_install_branch: 696d26fedd2f55b5b6a93cee9136e5beec00cb6b # HEAD of "master" as of 16.02.2018 +swift_git_install_branch: 9b4c978f99c993775e917f9ddec7cabb25c83c6d # HEAD of "master" as of 31.03.2018 swift_git_project_group: swift_all ## Swift3 middleware swift_swift3_git_repo: https://git.openstack.org/openstack/swift3 -swift_swift3_git_install_branch: 1c117c96dda8113c3398c16e68b61efef397de74 # HEAD of "master" as of 16.02.2018 +swift_swift3_git_install_branch: 520b8888343a96ef0253af8701b45f0bd5238264 # HEAD of "master" as of 31.03.2018 swift_swift3_git_project_group: swift_all ## Ironic service ironic_git_repo: https://git.openstack.org/openstack/ironic -ironic_git_install_branch: 1f69048b31cafb4d53a5f21ac430ac05ccd3e1b0 # HEAD of "master" as of 16.02.2018 +ironic_git_install_branch: 5816e50766e3ed9e08ff7fd7176a85b2ab835659 # HEAD of "master" as of 31.03.2018 ironic_git_project_group: ironic_all ## Magnum service magnum_git_repo: https://git.openstack.org/openstack/magnum -magnum_git_install_branch: 0ae8b16a496c87f77b248caa1a22733d3e62ac1f # HEAD of "master" as of 16.02.2018 +magnum_git_install_branch: 445853cff17b6c1693b0567e4e4f11621118b846 # HEAD of "master" as of 31.03.2018 magnum_git_project_group: magnum_all ## Trove service trove_git_repo: https://git.openstack.org/openstack/trove -trove_git_install_branch: f0c03c114e93cd580f74d4c31d51760b7a511d29 # HEAD of "master" as of 16.02.2018 +trove_git_install_branch: e96c0093cd7419252242a4f2b1435436f65697f7 # HEAD of "master" as of 31.03.2018 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: 5d6ddae5bb4e51ebb43e67a5e26c12c9698ff5b2 # HEAD of "master" as of 16.02.2018 +trove_dashboard_git_install_branch: aaf4f2642f1e7c48f29a03a0959da2549db3f04b # HEAD of "master" as of 31.03.2018 trove_dashboard_git_project_group: horizon_all ## Octavia service octavia_git_repo: https://git.openstack.org/openstack/octavia -octavia_git_install_branch: 8cca5deab3b8c398f6eaaaf87372c6e5572a681d # HEAD of "master" as of 16.02.2018 +octavia_git_install_branch: 592d1790c7c4515bc9dd7d9d851c88c4c8228ec3 # HEAD of "master" as of 31.03.2018 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 16.02.2018 +molteniron_git_install_branch: 094276cda77d814d07ad885e7d63de8d1243750a # HEAD of "master" as of 31.03.2018 molteniron_git_project_group: molteniron_all ## Tacker service tacker_git_repo: https://git.openstack.org/openstack/tacker -tacker_git_install_branch: 1df345f8dc984d84df362980703616d78a3465b6 # HEAD of "master" as of 16.02.2018 +tacker_git_install_branch: 6bea5c85f7f63acc841f323755fb508ec1e03422 # HEAD of "master" as of 31.03.2018 tacker_git_project_group: tacker_all ## Congress service congress_git_repo: https://git.openstack.org/openstack/congress -congress_git_install_branch: d3abc388515ba6456944093a6accde003dfea33f # HEAD of "master" as of 16.02.2018 +congress_git_install_branch: c6114ddf2209667b52c683bfc65601b3418da998 # HEAD of "master" as of 31.03.2018 congress_git_project_group: congress_all ## Horizon Octavia dashboard plugin octavia_dashboard_git_repo: https://git.openstack.org/openstack/octavia-dashboard -octavia_dashboard_git_install_branch: 1ba875ac378215c9f0fe8d8bcd1eae42c0d7274d # HEAD of "master" as of 16.02.2018 +octavia_dashboard_git_install_branch: 5a0b2b1af2a898539daa7bc4bdfb1c0c129af030 # HEAD of "master" as of 31.03.2018 octavia_dashboard_git_project_group: horizon_all diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml index 2b56c3f86a..abfb8b4746 100644 --- a/playbooks/defaults/repo_packages/openstack_testing.yml +++ b/playbooks/defaults/repo_packages/openstack_testing.yml @@ -27,13 +27,13 @@ ## Tempest service tempest_git_repo: https://git.openstack.org/openstack/tempest -tempest_git_install_branch: 3fb1d3689ea7848d9e2d53e53e98f455b303a0da # HEAD of "master" as of 16.02.2018 +tempest_git_install_branch: cad11526e3f5175722c26c4bae90f4357da9a067 # HEAD of "master" as of 31.03.2018 tempest_git_project_group: utility_all tempest_git_install_fragments: "venvwithindex=True&ignorerequirements=True" ## Rally service rally_git_repo: https://git.openstack.org/openstack/rally -rally_git_install_branch: 0ba733e5c45d545e12fbc98f2f442fab810b7c52 # HEAD of "master" as of 16.02.2018 +rally_git_install_branch: 4c687b50d97841f131c9f375d708e3fb59e6915e # HEAD of "master" as of 31.03.2018 rally_git_project_group: utility_all rally_git_install_fragments: "venvwithindex=True&ignorerequirements=True"