From 24b6801a67dae64b200031009f2f4eea700bc4cd Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 21 Feb 2022 19:29:09 +0100 Subject: [PATCH] Bump SHAs for master Change-Id: I5957d0723a7cc37e91006b0998d89ef199b2260d --- ansible-collection-requirements.yml | 64 +++++++++-------- playbooks/defaults/repo_packages/gnocchi.yml | 4 +- .../defaults/repo_packages/nova_consoles.yml | 2 +- .../repo_packages/openstack_services.yml | 70 +++++++++---------- .../repo_packages/openstack_testing.yml | 22 +++--- 5 files changed, 82 insertions(+), 80 deletions(-) diff --git a/ansible-collection-requirements.yml b/ansible-collection-requirements.yml index 2851e26e7c..cdc260bcd7 100644 --- a/ansible-collection-requirements.yml +++ b/ansible-collection-requirements.yml @@ -1,32 +1,34 @@ +--- + collections: - - name: https://opendev.org/openstack/ansible-collections-openstack - version: 1.5.3 - type: git - - name: https://opendev.org/openstack/ansible-config_template - version: 1.2.1 - type: git - - name: https://github.com/ansible-collections/community.general - version: 4.0.1 - type: git - - name: https://github.com/ansible-collections/community.rabbitmq - version: 1.1.0 - type: git - - name: https://github.com/ansible-collections/community.mysql - version: 2.3.1 - type: git - - name: https://github.com/ansible-collections/community.crypto - version: 1.9.5 - type: git - - name: https://github.com/ansible-collections/ansible.posix - version: 1.3.0 - type: git - # NOTE(noonedeadpunk): needs version in galaxy.yml to pull from git - - name: ansible.netcommon - version: 2.5.1 - source: https://galaxy.ansible.com - - name: openvswitch.openvswitch - version: 2.0.2 - source: https://galaxy.ansible.com - - name: https://opendev.org/openstack/openstack-ansible-plugins - version: master - type: git +- name: https://opendev.org/openstack/ansible-collections-openstack + version: 1.7.0 + type: git +- name: https://opendev.org/openstack/ansible-config_template + version: 1.2.1 + type: git +- name: https://opendev.org/openstack/openstack-ansible-plugins + version: master + type: git +- name: https://github.com/ansible-collections/community.general + version: 4.5.0 + type: git +- name: https://github.com/ansible-collections/community.rabbitmq + version: 1.1.0 + type: git +- name: https://github.com/ansible-collections/community.mysql + version: 3.1.1 + type: git +- name: https://github.com/ansible-collections/community.crypto + version: 2.2.2 + type: git +- name: https://github.com/ansible-collections/ansible.posix + version: 1.3.0 + type: git +# NOTE(noonedeadpunk): needs version in galaxy.yml to pull from git +- name: ansible.netcommon + version: 2.5.1 + source: https://galaxy.ansible.com +- name: openvswitch.openvswitch + version: 2.1.0 + source: https://galaxy.ansible.com diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/playbooks/defaults/repo_packages/gnocchi.yml index 08308b4853..ad16e3713b 100644 --- a/playbooks/defaults/repo_packages/gnocchi.yml +++ b/playbooks/defaults/repo_packages/gnocchi.yml @@ -29,11 +29,11 @@ ### or have a comment / reason attached to them as to why a tag can not work. -### HEAD as of 19.01.2022 ### +### HEAD as of 21.02.2022 ### ## 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. gnocchi_git_repo: https://github.com/gnocchixyz/gnocchi -gnocchi_git_install_branch: 92a7f5931c7c1a1b54bfead3bec9e80fddfb5490 +gnocchi_git_install_branch: 37516bfcf80ec9d0b60ef5bf37dae947ef0d68dc gnocchi_git_track_branch: stable/4.4 diff --git a/playbooks/defaults/repo_packages/nova_consoles.yml b/playbooks/defaults/repo_packages/nova_consoles.yml index 61e9331558..4e9d5a7dbc 100644 --- a/playbooks/defaults/repo_packages/nova_consoles.yml +++ b/playbooks/defaults/repo_packages/nova_consoles.yml @@ -24,7 +24,7 @@ ## * All items with this file should be separated by `name_` note that the name of the ## package should be one long name with no additional `_` separating it. -### HEAD as of 19.01.2022 ### +### HEAD as of 21.02.2022 ### ## NOVNC from source novncproxy_git_repo: https://github.com/novnc/noVNC diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 8048a81792..415ba25f43 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -28,11 +28,11 @@ ### Before this is shipped all of these services should have a tag set as the branch, ### or have a comment / reason attached to them as to why a tag can not work. -### HEAD as of 19.01.2022 ### +### HEAD as of 21.02.2022 ### ## Global Requirements requirements_git_repo: https://opendev.org/openstack/requirements -requirements_git_install_branch: 60103fbaba0ef217b9c87729dd03e84196e1a0c4 +requirements_git_install_branch: 8d397aa2552234af7a11bcf180393e53d0172500 requirements_git_track_branch: master ## Adjutant service @@ -53,7 +53,7 @@ aodh_git_track_branch: master ## Barbican service barbican_git_repo: https://opendev.org/openstack/barbican -barbican_git_install_branch: a9d2b133c8dc3307974f119f9a2b23a4ba82e8ce +barbican_git_install_branch: ffea7f79c9d4d1c37ecce44bc424eaff9704bdaa barbican_git_track_branch: master @@ -65,19 +65,19 @@ barbican_dashboard_git_track_branch: master ## Ceilometer service ceilometer_git_repo: https://opendev.org/openstack/ceilometer -ceilometer_git_install_branch: 6b63e9e34d6b07d830105fc8f140adc80aee707f +ceilometer_git_install_branch: bac34383c60b90ca674c1d3eb23cdb07d9233240 ceilometer_git_track_branch: master ## Cinder service cinder_git_repo: https://opendev.org/openstack/cinder -cinder_git_install_branch: 43ca0d6e3c1cf3d98ef8d4f32bfc401bea3d01a6 +cinder_git_install_branch: ac0779ad187cffdb173e50118c1c543727f450f8 cinder_git_track_branch: master ## Cloudkitty service cloudkitty_git_repo: https://opendev.org/openstack/cloudkitty -cloudkitty_git_install_branch: 78da8eac53c56566191aad548f035158877ccfe5 +cloudkitty_git_install_branch: 249ea001928d8eee4f7e28bec18ae5af28ccad40 cloudkitty_git_track_branch: master @@ -89,7 +89,7 @@ cloudkitty_dashboard_git_track_branch: master ## Designate service designate_git_repo: https://opendev.org/openstack/designate -designate_git_install_branch: bff3d5f6e31fe595a77143ec4ac779c187bf72a8 +designate_git_install_branch: cad560c52e9f39c69fda696e9095c052b4d23309 designate_git_track_branch: master @@ -101,33 +101,33 @@ designate_dashboard_git_track_branch: master ## Glance service glance_git_repo: https://opendev.org/openstack/glance -glance_git_install_branch: 909597c434e9edcad7b3d7242b19c81275ba60d9 +glance_git_install_branch: f5776e6c1cee15e05a8618bda67ae5c7f85b32e4 glance_git_track_branch: master ## Heat service heat_git_repo: https://opendev.org/openstack/heat -heat_git_install_branch: 9ed612906e388eda8bf850420cbceef54e05841c +heat_git_install_branch: b1fe9752b0e03a6036e7fde8312a8e0e80e297f9 heat_git_track_branch: master ## Horizon Heat dashboard plugin heat_dashboard_git_repo: https://opendev.org/openstack/heat-dashboard -heat_dashboard_git_install_branch: 458e9b05191d2ab08749967f7d958f5c08597bc7 +heat_dashboard_git_install_branch: 7729b7576040df7d264a5333472a2ef44fd55319 heat_dashboard_git_track_branch: master ## Horizon service horizon_git_repo: https://opendev.org/openstack/horizon -horizon_git_install_branch: 15e3252910d45821a1f84622d54b946ab9127097 +horizon_git_install_branch: 5e385fab25e3c50f5b756d31599c866be64fbfca horizon_git_track_branch: master ## Horizon Ironic dashboard plugin ironic_dashboard_git_repo: https://opendev.org/openstack/ironic-ui -ironic_dashboard_git_install_branch: 07e560755ad2b8b5b04862050c64f85a4f9231c1 +ironic_dashboard_git_install_branch: 9f493854b4b389e477d17abf9877850b37782cf4 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: fede1bee320c18c2f8f3a91d2c375b82e598e7b2 +magnum_dashboard_git_install_branch: 731488eaef5d5b28934af1c77b8e7289759be370 magnum_dashboard_git_track_branch: master ## Horizon Masakari dashboard plugin @@ -144,28 +144,28 @@ sahara_dashboard_git_track_branch: master ## Keystone service keystone_git_repo: https://opendev.org/openstack/keystone -keystone_git_install_branch: e92bf89f71334b934d974165e9d142c684b9fc1c +keystone_git_install_branch: a3fc9e7c3845387644f0661a6c6c0fd316b6c9ee keystone_git_track_branch: master ## Manila service manila_git_repo: https://opendev.org/openstack/manila -manila_git_install_branch: d1509256dac8d2e66d873e4b9d38e4e06f344b59 +manila_git_install_branch: 7c04fcb9047ab9ec854d8b8be69573ad2b55db75 manila_git_track_branch: master ## Neutron service neutron_git_repo: https://opendev.org/openstack/neutron -neutron_git_install_branch: 842b38c87d8b9d75e383006ff92723bccf1134d6 +neutron_git_install_branch: d7953381c45a058d01204aed36e4461764cbe5bc neutron_git_track_branch: master neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: 805d3851a5f67882e0a73735bf5be621d9206eef +neutron_vpnaas_git_install_branch: 8552d8e16836570b916a7815906f7d76915e921d neutron_vpnaas_git_track_branch: master neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing -neutron_dynamic_routing_git_install_branch: 627695cf5349e85043b2f5bfcd0543abe27089b1 +neutron_dynamic_routing_git_install_branch: 3d5cabaf5738d0f6040cd2ae5ce24a4988c75dbe neutron_dynamic_routing_git_track_branch: master # Networking calico follows master @@ -174,15 +174,15 @@ networking_calico_git_install_branch: 69ada593823daaecb997114e694522449839f131 networking_calico_git_track_branch: release-v3.21 networking_odl_git_repo: https://opendev.org/openstack/networking-odl -networking_odl_git_install_branch: b6753dea53ee343830d8c52710fc413ab83a03b8 +networking_odl_git_install_branch: b57cfa8b4bc1d0afe8549c15e0016d944cd3f9d5 networking_odl_git_track_branch: master networking_bgpvpn_git_repo: https://opendev.org/openstack/networking-bgpvpn -networking_bgpvpn_git_install_branch: 1789824ec90505d7d67c3b624d318c36b798fb12 +networking_bgpvpn_git_install_branch: 1d095558adb97e6a1dea441c93f08b5fa0b75671 networking_bgpvpn_git_track_branch: master networking_sfc_git_repo: https://opendev.org/openstack/networking-sfc -networking_sfc_git_install_branch: fc91fa4a081a07dbd1f90e38257e61fe01b4917f +networking_sfc_git_install_branch: 26274d2fd4c08dfdc21c09c8effc044241ef17fe networking_sfc_git_track_branch: master networking_generic_switch_git_repo: https://opendev.org/openstack/networking-generic-switch @@ -194,36 +194,36 @@ networking_nsx_git_install_branch: 0253265f75f63d5619b30f16a6b64459dec79d82 networking_nsx_git_track_branch: master networking_nsxlib_git_repo: https://opendev.org/x/vmware-nsxlib -networking_nsxlib_git_install_branch: 72985fb9054e94ddece9784f23fe84d13795575b +networking_nsxlib_git_install_branch: cfe4ed8e274d9322065a1a6f2c8bd8c74f6ca81f networking_nsxlib_git_track_branch: master ## Nova service nova_git_repo: https://opendev.org/openstack/nova -nova_git_install_branch: 7bb21723171c59b93e28f5d508c2b6df39220f13 +nova_git_install_branch: 0c31561792e0e13a9f8267e71fa484ab79957f04 nova_git_track_branch: master ## Sahara service sahara_git_repo: https://opendev.org/openstack/sahara -sahara_git_install_branch: aff7caef2ec71a0c7cd092bc77e5e8a0ad42f3eb +sahara_git_install_branch: f6a4a6e0b74ac59df29907b2db1980b8500004e8 sahara_git_track_branch: master ## Senlin service senlin_git_repo: https://opendev.org/openstack/senlin -senlin_git_install_branch: 39105af5596a8371a49ae311caa822bdd7a82585 +senlin_git_install_branch: 608e80b9ac6602b63614acf866cfd0e89da5f234 senlin_git_track_branch: master ## Swift service swift_git_repo: https://opendev.org/openstack/swift -swift_git_install_branch: b8d7c3dcb817504dcc0959ba52cc4ed2cf66c100 +swift_git_install_branch: 16a3067746ef7766a0ae7a9edf84a9557297422a swift_git_track_branch: master ## Ironic service ironic_git_repo: https://opendev.org/openstack/ironic -ironic_git_install_branch: c65cbb7aef1289b44d2f1ff0c3f0aaa7c31284c0 +ironic_git_install_branch: 2f09b7b1026551cb5818436a3714260fee9fcac4 ironic_git_track_branch: master @@ -235,7 +235,7 @@ ironic_inspector_git_track_branch: master ## Magnum service magnum_git_repo: https://opendev.org/openstack/magnum -magnum_git_install_branch: fa298eeab19b1d87070d72c7c4fb26cd75b0781e +magnum_git_install_branch: 2a7ab5e9a37565760fb57fb00f5604f1486cdfb1 magnum_git_track_branch: master ## Masakari service @@ -264,7 +264,7 @@ murano_dashboard_git_track_branch: master ## Trove service trove_git_repo: https://opendev.org/openstack/trove -trove_git_install_branch: be86b79119d16ee77f596172f43b0c97cb2617bd +trove_git_install_branch: 39322f5ad88cf5eef003af74294676a5563a8296 trove_git_track_branch: master ## Horizon Trove dashboard plugin @@ -275,36 +275,36 @@ trove_dashboard_git_track_branch: master ## Octavia service octavia_git_repo: https://opendev.org/openstack/octavia -octavia_git_install_branch: 12e9bb52c232603be62ef5e1a5c8aaa7770a18c9 +octavia_git_install_branch: d1c207be2b687b75d812346661eab976ac1d1aff octavia_git_track_branch: master ## Placement service placement_git_repo: https://opendev.org/openstack/placement -placement_git_install_branch: d48d22ff24535eb5ae947d60fd87a9afb2e7b45d +placement_git_install_branch: 91b85ba7abf8e89fc565cb5af53c1753d6a98895 placement_git_track_branch: master ## Tacker service tacker_git_repo: https://opendev.org/openstack/tacker -tacker_git_install_branch: ef9384cc1be1cf060d71317acc37b0c0f2734678 +tacker_git_install_branch: 4d6031883cb65cc1a90b4f1e8316540008f47828 tacker_git_track_branch: master ## Horizon Octavia dashboard plugin octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard -octavia_dashboard_git_install_branch: 83267ea0d071a410baf559c049f7f932243579da +octavia_dashboard_git_install_branch: d42395fcb70408b8eba96e60af1769532d85d36e octavia_dashboard_git_track_branch: master ## Blazar service blazar_git_repo: https://opendev.org/openstack/blazar -blazar_git_install_branch: 39c67f09b8095c4d8aadfe550f0aa924a3693f5a +blazar_git_install_branch: 9a37ded91964cf68eb1c8572c07618e2f19120ac blazar_git_track_branch: master ## Blazar Nova Service blazar_nova_git_repo: https://opendev.org/openstack/blazar-nova -blazar_nova_git_install_branch: 63560cf76550f864caec8ea7393f04c2fad8d932 +blazar_nova_git_install_branch: 3d01888c14a785e796393d7f6a2b0792b1b1f2e0 blazar_nova_git_track_branch: master ## Zun service diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml index a62472df39..ed7a45f7bb 100644 --- a/playbooks/defaults/repo_packages/openstack_testing.yml +++ b/playbooks/defaults/repo_packages/openstack_testing.yml @@ -13,26 +13,26 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 19.01.2022 ### +### HEAD as of 21.02.2022 ### tempest_git_repo: https://opendev.org/openstack/tempest -tempest_git_install_branch: eb860bca57b27da4f1b33de06763abd5fb784afb +tempest_git_install_branch: ca03d2b504eabb19aff56ea6673eeb9a7d7b22fe tempest_git_track_branch: master tempest_plugin_barbican_git_repo: https://opendev.org/openstack/barbican-tempest-plugin -tempest_plugin_barbican_git_install_branch: 2f208f0eac1f6b2457e7245b028dd3be58143862 +tempest_plugin_barbican_git_install_branch: 9fe096e1422c7c884b94166763b4857b5abcea30 tempest_plugin_barbican_git_track_branch: master tempest_plugin_cinder_git_repo: https://opendev.org/openstack/cinder-tempest-plugin -tempest_plugin_cinder_git_install_branch: fc98b2866ec894bce8a79fc647ac601e5c39df49 +tempest_plugin_cinder_git_install_branch: a3b2272871db9ceacf99324f980f12af716f7b69 tempest_plugin_cinder_git_track_branch: master tempest_plugin_cloudkitty_git_repo: https://opendev.org/openstack/cloudkitty-tempest-plugin -tempest_plugin_cloudkitty_git_install_branch: b1117d5d5930e7128167b69389e85040070903b4 +tempest_plugin_cloudkitty_git_install_branch: 03d07b84ef4dffa685718ec4124d283e47ffc5e1 tempest_plugin_cloudkitty_git_track_branch: master tempest_plugin_designate_git_repo: https://opendev.org/openstack/designate-tempest-plugin -tempest_plugin_designate_git_install_branch: e97ec918f170391854c986c0ae777c18afc0df77 +tempest_plugin_designate_git_install_branch: 45b3d39d422dd1062abfe849f15a4aeb37b3d462 tempest_plugin_designate_git_track_branch: master tempest_plugin_heat_git_repo: https://opendev.org/openstack/heat-tempest-plugin @@ -40,11 +40,11 @@ tempest_plugin_heat_git_install_branch: ba43685c131d6387779ed35f5bf61fc86667a728 tempest_plugin_heat_git_track_branch: master tempest_plugin_ironic_git_repo: https://opendev.org/openstack/ironic-tempest-plugin -tempest_plugin_ironic_git_install_branch: 3d2de82b3e08b348732156ab95a492cd40022e17 +tempest_plugin_ironic_git_install_branch: fd43dcc3b607603978c51ca605dc70e1b784d782 tempest_plugin_ironic_git_track_branch: master tempest_plugin_keystone_git_repo: https://opendev.org/openstack/keystone-tempest-plugin -tempest_plugin_keystone_git_install_branch: f57af91f9a97a822d2deee1fd32857ad4571d210 +tempest_plugin_keystone_git_install_branch: 4eff632695fe79a5d78f400dca3ceab663c83788 tempest_plugin_keystone_git_track_branch: master tempest_plugin_magnum_git_repo: https://opendev.org/openstack/magnum-tempest-plugin @@ -60,7 +60,7 @@ tempest_plugin_murano_git_install_branch: e3ff4504b590a7b170cd0dd5406909afeafd3f tempest_plugin_murano_git_track_branch: master tempest_plugin_neutron_git_repo: https://opendev.org/openstack/neutron-tempest-plugin -tempest_plugin_neutron_git_install_branch: d48e1d709cef66413f5ec006bab0b15697d5b253 +tempest_plugin_neutron_git_install_branch: d2ecabb4fc1f35aa6374260f8b89cea0c467534b tempest_plugin_neutron_git_track_branch: master tempest_plugin_novajoin_git_repo: https://opendev.org/x/novajoin-tempest-plugin @@ -68,11 +68,11 @@ tempest_plugin_novajoin_git_install_branch: b2e548518a8893562ed111fe66f5937603f5 tempest_plugin_novajoin_git_track_branch: master tempest_plugin_octavia_git_repo: https://opendev.org/openstack/octavia-tempest-plugin -tempest_plugin_octavia_git_install_branch: 7de0490e79a450a3fabe3188bf7a9af16c554c2d +tempest_plugin_octavia_git_install_branch: a3a95b132eac0b37fe85835d89b195ac08436501 tempest_plugin_octavia_git_track_branch: master tempest_plugin_senlin_git_repo: https://opendev.org/openstack/senlin-tempest-plugin -tempest_plugin_senlin_git_install_branch: f300314aa3bc78bd00fbb1a7cb6f38c7372451f4 +tempest_plugin_senlin_git_install_branch: 7a8121fc5f51f17f9f56a7d73739ed4378ba264f tempest_plugin_senlin_git_track_branch: master tempest_plugin_sahara_git_repo: https://opendev.org/openstack/sahara-tests