diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index a585a1b5ef..229fc62814 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -1,32 +1,32 @@ - name: ansible-hardening scm: git src: https://opendev.org/openstack/ansible-hardening - version: master + version: 1dc0aaa4c12cb2617597ba536f80cc901f9a3623 trackbranch: master - name: apt_package_pinning scm: git src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning - version: master + version: 41619e1f0a52eb2c0888e329d6275ebeeb1c922e trackbranch: master - name: config_template scm: git src: https://opendev.org/openstack/ansible-config_template - version: master + version: 8e18f42eb62ba50c28cdb973b8a45309486478de trackbranch: master - name: galera_server scm: git src: https://opendev.org/openstack/openstack-ansible-galera_server - version: master + version: 05701ba83d7c6efb7c261d84f09235a60d2aff67 trackbranch: master - name: ceph_client scm: git src: https://opendev.org/openstack/openstack-ansible-ceph_client - version: master + version: 2952f1e607968d1c22b724bf30312fb85a04fcd0 trackbranch: master - name: haproxy_server scm: git src: https://opendev.org/openstack/openstack-ansible-haproxy_server - version: master + version: c304e94144c990d3a33052f10947e302c5269974 trackbranch: master - name: keepalived scm: git @@ -36,212 +36,212 @@ - name: lxc_container_create scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_container_create - version: master + version: 1c0b68b9f5ee885f6095d1adfbfc8d3cc4ad71e0 trackbranch: master - name: lxc_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_hosts - version: master + version: 7e25305c7585845007d17299ec0bd4583b73e41c trackbranch: master - name: memcached_server scm: git src: https://opendev.org/openstack/openstack-ansible-memcached_server - version: master + version: de09d0397e9a6fd2da5710d062f4a185169b528e trackbranch: master - name: openstack_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-openstack_hosts - version: master + version: bc39b74cd04382cb8fc1ad139aa922421e283618 trackbranch: master - name: os_keystone scm: git src: https://opendev.org/openstack/openstack-ansible-os_keystone - version: master + version: e1820a587d1ea45e043d1fd58b43247ff717ea4d trackbranch: master - name: openstack_openrc scm: git src: https://opendev.org/openstack/openstack-ansible-openstack_openrc - version: master + version: 55fef70e168bcd44abba9f0614d55ab0a5d6285f trackbranch: master - name: os_aodh scm: git src: https://opendev.org/openstack/openstack-ansible-os_aodh - version: master + version: 16d0ab5d47d3e1d9bbe2a3183f20f84f3c3529af trackbranch: master - name: os_barbican scm: git src: https://opendev.org/openstack/openstack-ansible-os_barbican - version: master + version: 60f96a6eccc2f65ae8b0e5c0b03be80745dd509f trackbranch: master - name: os_blazar scm: git src: https://opendev.org/openstack/openstack-ansible-os_blazar - version: master + version: adffa22a0cbb69065c12aa8317cc0105e645a0aa trackbranch: master - name: os_ceilometer scm: git src: https://opendev.org/openstack/openstack-ansible-os_ceilometer - version: master + version: 2ab8c7226dfea650c3f2396c763807dc81b6be17 trackbranch: master - name: os_cinder scm: git src: https://opendev.org/openstack/openstack-ansible-os_cinder - version: master + version: 6309a28671819a4ae92aac28af9006e6eb4cba56 trackbranch: master - name: os_cloudkitty scm: git src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty - version: master + version: d6b4416a486158282365e494cada20bf185c24f4 trackbranch: master - name: os_congress scm: git src: https://opendev.org/openstack/openstack-ansible-os_congress - version: master + version: e983e54e9b7e6b3966f357e75170d45ec00b9d3d trackbranch: master - name: os_designate scm: git src: https://opendev.org/openstack/openstack-ansible-os_designate - version: master + version: c7636f96659ddeadce9a4d468ddd38f1aeb09cb8 trackbranch: master - name: os_glance scm: git src: https://opendev.org/openstack/openstack-ansible-os_glance - version: master + version: c1268a759036f17cb97e50515514850704448028 trackbranch: master - name: os_gnocchi scm: git src: https://opendev.org/openstack/openstack-ansible-os_gnocchi - version: master + version: a8a684ab30b8da135430b2981828b0f95f1bfc74 trackbranch: master - name: os_heat scm: git src: https://opendev.org/openstack/openstack-ansible-os_heat - version: master + version: ceb25178c05681f4d239696d16bac5b45a92c7f4 trackbranch: master - name: os_horizon scm: git src: https://opendev.org/openstack/openstack-ansible-os_horizon - version: master + version: d46dee4920a8a99976f5253dcc848331258d36a9 trackbranch: master - name: os_ironic scm: git src: https://opendev.org/openstack/openstack-ansible-os_ironic - version: master + version: 1c4955e4b2233ee001aa52eea99a231ad78ba95a trackbranch: master - name: os_magnum scm: git src: https://opendev.org/openstack/openstack-ansible-os_magnum - version: master + version: c65816fc062a2e809959251838297c99b62c7651 trackbranch: master - name: os_manila scm: git src: https://opendev.org/openstack/openstack-ansible-os_manila - version: master + version: 61e406508b10b8a26dc4c443dcdf81603b1b0313 trackbranch: master - name: os_masakari scm: git src: https://opendev.org/openstack/openstack-ansible-os_masakari - version: master + version: 02a2ee2a29f0da28687e5a44fde49ad55204a5d0 trackbranch: master - name: os_mistral scm: git src: https://opendev.org/openstack/openstack-ansible-os_mistral - version: master + version: 66413740a4a6e0d560ef7c8399e2471f80f978a5 trackbranch: master - name: os_murano scm: git src: https://opendev.org/openstack/openstack-ansible-os_murano - version: master + version: dae54fd2a86910117f42d790670d181e0cb695d5 trackbranch: master - name: os_neutron scm: git src: https://opendev.org/openstack/openstack-ansible-os_neutron - version: master + version: 991b3369b4ffba477e2312f03e784f96f12ffd26 trackbranch: master - name: os_nova scm: git src: https://opendev.org/openstack/openstack-ansible-os_nova - version: master + version: 3e51d1537ddc550ac1f4f666a1d6a1d37d971765 trackbranch: master - name: os_octavia scm: git src: https://opendev.org/openstack/openstack-ansible-os_octavia - version: master + version: 98ed3d22f6c7b2892fc8441dfacb04e5aeccaa7a trackbranch: master - name: os_panko scm: git src: https://opendev.org/openstack/openstack-ansible-os_panko - version: master + version: 321e4c290aedbd448babef37424d2128af695889 trackbranch: master - name: os_placement scm: git src: https://opendev.org/openstack/openstack-ansible-os_placement - version: master + version: 8874326af9edfbd7cdd5bd7d884f8566f42436d0 trackbranch: master - name: os_rally scm: git src: https://opendev.org/openstack/openstack-ansible-os_rally - version: master + version: e1bad838d1b8aad5a4482c09026eafb74887dc2d trackbranch: master - name: os_sahara scm: git src: https://opendev.org/openstack/openstack-ansible-os_sahara - version: master + version: ec36bbf056e8cfacd68ea06e53105bdfe12d53b5 trackbranch: master - name: os_swift scm: git src: https://opendev.org/openstack/openstack-ansible-os_swift - version: master + version: 5f4fb27342ecefb10ec6210a7645a0bf32131e08 trackbranch: master - name: os_tacker scm: git src: https://opendev.org/openstack/openstack-ansible-os_tacker - version: master + version: d89e5c685bb190ce6e92127e6e431a3b0b30bbcb trackbranch: master - name: os_tempest scm: git src: https://opendev.org/openstack/openstack-ansible-os_tempest - version: master + version: 1ab029b7b4869e480cc8d580e2a333c8366db0ba trackbranch: master - name: os_trove scm: git src: https://opendev.org/openstack/openstack-ansible-os_trove - version: master + version: 33d8c1b058720de3ffd385d60f8837c618a55361 trackbranch: master - name: os_zun scm: git src: https://opendev.org/openstack/openstack-ansible-os_zun - version: master + version: 120d45b431acbf02494ca0d7a21205ef5708632e trackbranch: master - name: plugins scm: git src: https://opendev.org/openstack/openstack-ansible-plugins - version: master + version: 03695fa1cc6cb1b730993e3cc3692ee9c9f0c4d2 trackbranch: master - name: qdrouterd scm: git src: https://opendev.org/openstack/ansible-role-qdrouterd - version: master + version: 9072982dbf0bcfb7bea74cbbd43276abb6e21f0b trackbranch: master - name: rabbitmq_server scm: git src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server - version: master + version: 8de3c6f2258089b10edc8de59278f625063ec5b8 trackbranch: master - name: repo_server scm: git src: https://opendev.org/openstack/openstack-ansible-repo_server - version: master + version: 659f21aeecc8b0001da6323f5b369f4343fbf100 trackbranch: master - name: rsyslog_client scm: git src: https://opendev.org/openstack/openstack-ansible-rsyslog_client - version: master + version: 15e1dece89db7b360e0cc153a5a84ff8eaf09de8 trackbranch: master - name: rsyslog_server scm: git src: https://opendev.org/openstack/openstack-ansible-rsyslog_server - version: master + version: 91b026cf64c0d65574895aa1b6bf96920e3dac6f trackbranch: master - name: sshd scm: git @@ -286,35 +286,35 @@ - name: nspawn_container_create src: https://opendev.org/openstack/openstack-ansible-nspawn_container_create scm: git - version: master + version: 1222ed65167b31fcb15471426581b926b22b0a49 trackbranch: master - name: nspawn_hosts src: https://opendev.org/openstack/openstack-ansible-nspawn_hosts scm: git - version: master + version: 75b4d0ee257220f5315c22b564f15835fd9df53e trackbranch: master - name: systemd_service src: https://opendev.org/openstack/ansible-role-systemd_service scm: git - version: master + version: b049c6919d988543690e55123f9a811e984654f8 trackbranch: master - name: systemd_mount src: https://opendev.org/openstack/ansible-role-systemd_mount scm: git - version: master + version: fa64262a5d4005ff26c668b65f2cd916c851958c trackbranch: master - name: systemd_networkd src: https://opendev.org/openstack/ansible-role-systemd_networkd scm: git - version: master + version: e99175611fd3e70079328695bfa3871c9dacc6a0 trackbranch: master - name: python_venv_build src: https://opendev.org/openstack/ansible-role-python_venv_build scm: git - version: master + version: 6164fa224b0881f11e5923ab84055165c104a39a trackbranch: master - name: uwsgi src: https://opendev.org/openstack/ansible-role-uwsgi scm: git - version: master + version: 73a7ef31b03579bd33cf8a2bcccdaafb37623f47 trackbranch: master diff --git a/doc/source/conf.py b/doc/source/conf.py index a166111219..2ce87b6a1c 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -33,8 +33,8 @@ import yaml # 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' diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt index 58ea4e2e48..c58b0e30a8 100644 --- a/global-requirement-pins.txt +++ b/global-requirement-pins.txt @@ -6,6 +6,6 @@ # Use this file with caution! # -pip==20.0.2 -setuptools==46.1.3 +pip==20.1.1 +setuptools==46.4.0 wheel==0.34.2 diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/playbooks/defaults/repo_packages/gnocchi.yml index b9399bdb17..3aafe418c2 100644 --- a/playbooks/defaults/repo_packages/gnocchi.yml +++ b/playbooks/defaults/repo_packages/gnocchi.yml @@ -34,6 +34,6 @@ ## 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 19.04.2020 +gnocchi_git_install_branch: 8cbc9ee4c3ff35786fd2d091756e9469abd49e1d # HEAD as of 19.05.2020 gnocchi_git_project_group: gnocchi_all gnocchi_git_track_branch: stable/4.3 diff --git a/playbooks/defaults/repo_packages/nova_consoles.yml b/playbooks/defaults/repo_packages/nova_consoles.yml index de292a0e88..a5ee909859 100644 --- a/playbooks/defaults/repo_packages/nova_consoles.yml +++ b/playbooks/defaults/repo_packages/nova_consoles.yml @@ -27,16 +27,13 @@ ## NOVNC from source novncproxy_git_repo: https://github.com/novnc/noVNC -# NOTE(mnaser): NoVNC broke downstream Nova with their change, we can start tracking -# master again once the following is fixed. -# https://bugs.launchpad.net/openstack-ansible/+bug/1822676 -novncproxy_git_install_branch: 8c2866df3619e49d629b5f98c20d27a7c72d102a +novncproxy_git_install_branch: 42e3b03fa8af4373a36c73af2a207eca8490f6ac # HEAD as of 19.05.2020 novncproxy_git_project_group: nova_console -novncproxy_git_track_branch: None +novncproxy_git_track_branch: master ## spice-html5 from source spicehtml5_git_repo: https://github.com/freedesktop/spice-html5 -spicehtml5_git_install_branch: 5fae52199b9726053449007189ab15aba57cffa1 # HEAD as of 19.04.2020 +spicehtml5_git_install_branch: 5fae52199b9726053449007189ab15aba57cffa1 # HEAD as of 19.05.2020 spicehtml5_git_project_group: nova_console spicehtml5_git_track_branch: master diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 4afcd8ebcf..3fc977ca04 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,306 +31,299 @@ ## Global Requirements requirements_git_repo: https://opendev.org/openstack/requirements -requirements_git_install_branch: f55297cc5737c5f5b866431ad9e9e42116039582 # HEAD as of 19.04.2020 -requirements_git_track_branch: master +requirements_git_install_branch: 3ea52d2d2de58356ca2d73c956e956e422b1e200 # HEAD as of 19.05.2020 +requirements_git_track_branch: stable/ussuri ## Aodh service aodh_git_repo: https://opendev.org/openstack/aodh -aodh_git_install_branch: 20d03d2ebed673b00c821fc49c8888b7c969d68d # HEAD as of 19.04.2020 +aodh_git_install_branch: d7b4f91c2f2e9d6a18a10ee4b668f8f78890cdb3 # HEAD as of 19.05.2020 aodh_git_project_group: aodh_all -aodh_git_track_branch: master +aodh_git_track_branch: stable/ussuri ## Barbican service barbican_git_repo: https://opendev.org/openstack/barbican -barbican_git_install_branch: 7b14d983e0dce6dcffe9781b05c52335b8203fc7 # HEAD as of 19.04.2020 +barbican_git_install_branch: 7b14d983e0dce6dcffe9781b05c52335b8203fc7 # HEAD as of 19.05.2020 barbican_git_project_group: barbican_all -barbican_git_track_branch: master +barbican_git_track_branch: stable/ussuri ## Ceilometer service ceilometer_git_repo: https://opendev.org/openstack/ceilometer -ceilometer_git_install_branch: e01c24cc96a5d087c24554da961e3e9b3d34e99e # HEAD as of 19.04.2020 +ceilometer_git_install_branch: 27a1671c81c80fe9400f9c265f99669368b01138 # HEAD as of 19.05.2020 ceilometer_git_project_group: all -ceilometer_git_track_branch: master +ceilometer_git_track_branch: stable/ussuri ## Cinder service cinder_git_repo: https://opendev.org/openstack/cinder -cinder_git_install_branch: 2b5ff4da0f58369c19a6655e3a8dd0d87de33b87 # HEAD as of 19.04.2020 +cinder_git_install_branch: d077c4f66ff7039a8e41bf1dab59ec06da40e974 # HEAD as of 19.05.2020 cinder_git_project_group: cinder_all -cinder_git_track_branch: master +cinder_git_track_branch: stable/ussuri ## Designate service designate_git_repo: https://opendev.org/openstack/designate -designate_git_install_branch: 846f919ec83fc829df9bc05cd76cb2ff2db2b764 # HEAD as of 19.04.2020 +designate_git_install_branch: d7e8b938d7105d7d51dc3f9000b398a3fd7e2c1a # HEAD as of 19.05.2020 designate_git_project_group: designate_all -designate_git_track_branch: master +designate_git_track_branch: stable/ussuri ## Horizon Designate dashboard plugin designate_dashboard_git_repo: https://opendev.org/openstack/designate-dashboard -designate_dashboard_git_install_branch: 41c19d9159519bd919d7e230ab0fca7c4324121d # HEAD as of 19.04.2020 +designate_dashboard_git_install_branch: 41c19d9159519bd919d7e230ab0fca7c4324121d # HEAD as of 19.05.2020 designate_dashboard_git_project_group: horizon_all -designate_dashboard_git_track_branch: master +designate_dashboard_git_track_branch: stable/ussuri ## Glance service glance_git_repo: https://opendev.org/openstack/glance -glance_git_install_branch: bd16ab256e6bf6b423f3bdbd366ba0b56d5bc619 # HEAD as of 19.04.2020 +glance_git_install_branch: f78463ed32f67e551662c77c6bd9beff80a2121f # HEAD as of 19.05.2020 glance_git_project_group: glance_all -glance_git_track_branch: master +glance_git_track_branch: stable/ussuri ## Heat service heat_git_repo: https://opendev.org/openstack/heat -heat_git_install_branch: d4c7e27a7ef58bb9ee925573c418c311bea0be9a # HEAD as of 19.04.2020 +heat_git_install_branch: bceca6189581ba6b462c306f00fb1d9538795d6d # HEAD as of 19.05.2020 heat_git_package_name: openstack-heat heat_git_project_group: heat_all -heat_git_track_branch: master +heat_git_track_branch: stable/ussuri ## Horizon Heat dashboard plugin heat_dashboard_git_repo: https://opendev.org/openstack/heat-dashboard -heat_dashboard_git_install_branch: 78421908513eec5366fda3081e47c085ad2f89d0 # HEAD as of 19.04.2020 +heat_dashboard_git_install_branch: 0d135670371e8743d93ee37b9d83c68e363d974d # HEAD as of 19.05.2020 heat_dashboard_git_project_group: horizon_all -heat_dashboard_git_track_branch: master +heat_dashboard_git_track_branch: stable/ussuri ## Horizon service horizon_git_repo: https://opendev.org/openstack/horizon -horizon_git_install_branch: 6644defda0fbfc744f34b8d4c336e737edfa3ccc # HEAD as of 19.04.2020 +horizon_git_install_branch: d3ba7f17cd675e12d087bde1adf995fcaace48d4 # HEAD as of 19.05.2020 horizon_git_project_group: horizon_all -horizon_git_track_branch: master +horizon_git_track_branch: stable/ussuri ## Horizon Ironic dashboard plugin ironic_dashboard_git_repo: https://opendev.org/openstack/ironic-ui -ironic_dashboard_git_install_branch: eaf3f0d69f5972f412bc3959fdec42ce2ffed12d # HEAD as of 19.04.2020 +ironic_dashboard_git_install_branch: 80129bd6f82196bb24bc1394b77bfaa88e7163e3 # HEAD as of 19.05.2020 ironic_dashboard_git_project_group: horizon_all -ironic_dashboard_git_track_branch: master +ironic_dashboard_git_track_branch: stable/ussuri ## Horizon Magnum dashboard plugin magnum_dashboard_git_repo: https://opendev.org/openstack/magnum-ui -magnum_dashboard_git_install_branch: c39507c88d54e3b1095825ab13833e1bec096277 # HEAD as of 19.04.2020 +magnum_dashboard_git_install_branch: 8a01cc4a239d3b31d12fae66a1fe41755ca6af93 # HEAD as of 19.05.2020 magnum_dashboard_git_project_group: horizon_all -magnum_dashboard_git_track_branch: master +magnum_dashboard_git_track_branch: stable/ussuri ## Horizon Masakari dashboard plugin masakari_dashboard_git_repo: https://opendev.org/openstack/masakari-dashboard -masakari_dashboard_git_install_branch: 933bc20fc2eae8f10c327b4307596ed0f99c6e7c # HEAD as of 19.04.2020 +masakari_dashboard_git_install_branch: 76604431b58c1d115dd793a069d09dc1f74a80ff # HEAD as of 19.05.2020 masakari_dashboard_git_project_group: horizon_all -masakari_dashboard_git_track_branch: master +masakari_dashboard_git_track_branch: stable/ussuri ## Horizon FWaaS dashboard plugin neutron_fwaas_dashboard_git_repo: https://opendev.org/openstack/neutron-fwaas-dashboard -neutron_fwaas_dashboard_git_install_branch: d49e7ef3a3b7b8559d00535cc612ba096459c861 # HEAD as of 19.04.2020 +neutron_fwaas_dashboard_git_install_branch: ed079563319ee07eb9ea919ebd3fd7c3449a392a # HEAD as of 19.05.2020 neutron_fwaas_dashboard_git_project_group: horizon_all -neutron_fwaas_dashboard_git_track_branch: master +neutron_fwaas_dashboard_git_track_branch: stable/ussuri ## Horizon Sahara dashboard plugin sahara_dashboard_git_repo: https://opendev.org/openstack/sahara-dashboard -sahara_dashboard_git_install_branch: 4037b8be442b30b2978b3872e4f74ccb2f1a3510 # HEAD as of 19.04.2020 +sahara_dashboard_git_install_branch: 0fa9e96aa8588063edf95c7b5dd45e982f82bedc # HEAD as of 19.05.2020 sahara_dashboard_git_project_group: horizon_all -sahara_dashboard_git_track_branch: master +sahara_dashboard_git_track_branch: stable/ussuri ## Keystone service keystone_git_repo: https://opendev.org/openstack/keystone -keystone_git_install_branch: cb39c7245baa28a25ae428a6bfe8a570a119f934 # HEAD as of 19.04.2020 +keystone_git_install_branch: 28bce595bb5d7d61c09c183c053f89c216fb8d62 # HEAD as of 19.05.2020 keystone_git_project_group: keystone_all -keystone_git_track_branch: master +keystone_git_track_branch: stable/ussuri ## Manila service manila_git_repo: https://opendev.org/openstack/manila -manila_git_install_branch: 301789f9be30739723120e1d60203ef8aeb19a8b # HEAD as of 19.04.2020 +manila_git_install_branch: 7196cfcb091d66856a1ca0db53816198249196db # HEAD as of 19.05.2020 manila_git_project_group: manila_all -manila_git_track_branch: master +manila_git_track_branch: stable/ussuri ## Neutron service neutron_git_repo: https://opendev.org/openstack/neutron -neutron_git_install_branch: af1af5d3e73ac0e07b97b8cbbb63176e7adcc628 # HEAD as of 19.04.2020 +neutron_git_install_branch: f502de5de92186ef1ebceaadd85169e439a0110f # HEAD as of 19.05.2020 neutron_git_project_group: neutron_all -neutron_git_track_branch: master +neutron_git_track_branch: stable/ussuri neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: be935a2256d5426e9617c8d119e58b00df9fc3d9 # HEAD as of 19.04.2020 +neutron_vpnaas_git_install_branch: f22bc9f64fd9f9bb0b73c6f24be878ad77f9359d # HEAD as of 19.05.2020 neutron_vpnaas_git_project_group: neutron_all -neutron_vpnaas_git_track_branch: master +neutron_vpnaas_git_track_branch: stable/ussuri neutron_fwaas_git_repo: https://opendev.org/openstack/neutron-fwaas -neutron_fwaas_git_install_branch: 5e6c048856f06234e93d4306ae6a5b8e1d6917c4 # HEAD as of 19.04.2020 +neutron_fwaas_git_install_branch: 59bad17387d15f86ea7d08f8675208160a999ffe # HEAD as of 19.05.2020 neutron_fwaas_git_project_group: neutron_all -neutron_fwaas_git_track_branch: master +neutron_fwaas_git_track_branch: stable/ussuri neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing -neutron_dynamic_routing_git_install_branch: 045811b0d2d3c96903325a801a8c73bdea1546ec # HEAD as of 19.04.2020 +neutron_dynamic_routing_git_install_branch: 42000ee7a5383b4e3883c11e574cafe075ba245e # HEAD as of 19.05.2020 neutron_dynamic_routing_git_project_group: neutron_all -neutron_dynamic_routing_git_track_branch: master +neutron_dynamic_routing_git_track_branch: stable/ussuri # Networking calico follows master -networking_calico_git_repo: https://opendev.org/openstack/networking-calico -networking_calico_git_install_branch: 3.11.1 # HEAD as of 12.01.2020 +networking_calico_git_repo: https://github.com/projectcalico/networking-calico +networking_calico_git_install_branch: v3.14.0 # HEAD as of 19.05.2020 networking_calico_git_project_group: neutron_all networking_calico_git_track_branch: None networking_odl_git_repo: https://opendev.org/openstack/networking-odl -networking_odl_git_install_branch: 3de47a82996c66a3349d880c7a0c34a0b0e0ae6f # HEAD as of 19.04.2020 +networking_odl_git_install_branch: 56d5d9594f1254b313670ba73e1b4ac13f021f1a # HEAD as of 19.05.2020 networking_odl_git_project_group: neutron_all -networking_odl_git_track_branch: master +networking_odl_git_track_branch: stable/ussuri -networking_ovn_git_repo: https://opendev.org/openstack/networking-ovn -networking_ovn_git_install_branch: eda5d7f80d877601170631c5f5485370ea701f42 # HEAD as of 19.04.2020 -networking_ovn_git_project_group: neutron_all -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://opendev.org/openstack/networking-bgpvpn -networking_bgpvpn_git_install_branch: 3b93ddacd390d92fb144e5660324d4da064ad9a4 # FROZEN HEAD of "master" as of 31.03.2018 +networking_bgpvpn_git_install_branch: 419efcc7d71839afdcfde67d77409a746f8aa309 # HEAD as of 19.05.2020 networking_bgpvpn_git_project_group: neutron_all -networking_bgpvpn_git_track_branch: None +networking_bgpvpn_git_track_branch: stable/ussuri networking_sfc_git_repo: https://opendev.org/openstack/networking-sfc -networking_sfc_git_install_branch: 84175687fb5c23fdf76322b18392c783ca8d6d73 # HEAD as of 19.04.2020 +networking_sfc_git_install_branch: 3d4f69841d4cb20880a2cbfaa263dee8d0f545b3 # HEAD as of 19.05.2020 networking_sfc_git_project_group: neutron_all -networking_sfc_git_track_branch: master +networking_sfc_git_track_branch: stable/ussuri ## Nova service nova_git_repo: https://opendev.org/openstack/nova -nova_git_install_branch: 19eeacfa727b85c328c25a75d369082694cccc6d # HEAD as of 19.04.2020 +nova_git_install_branch: e8b3927c92d29c74fd0c79b5a51b7a34e9d66236 # HEAD as of 19.05.2020 nova_git_project_group: nova_all -nova_git_track_branch: master +nova_git_track_branch: stable/ussuri ## Sahara service sahara_git_repo: https://opendev.org/openstack/sahara -sahara_git_install_branch: 0825bddef65c11928ae6d37a2a7702e2d9435143 # HEAD as of 19.04.2020 +sahara_git_install_branch: 1bfa7c1e63554adbfa68271b128d385040c3d23b # HEAD as of 19.05.2020 sahara_git_project_group: sahara_all -sahara_git_track_branch: master +sahara_git_track_branch: stable/ussuri ## Swift service swift_git_repo: https://opendev.org/openstack/swift -swift_git_install_branch: f3543f5346a3d7ae31fe193f1336ef178da7db9b # HEAD as of 19.04.2020 +swift_git_install_branch: 16f6af9c97afb12cdf1071bf30b83e33582e2aef # HEAD as of 19.05.2020 swift_git_project_group: swift_all -swift_git_track_branch: master +swift_git_track_branch: stable/ussuri ## Ironic service ironic_git_repo: https://opendev.org/openstack/ironic -ironic_git_install_branch: 8a143378cb3fe1963ee701d9b4cf88c352d62749 # HEAD as of 19.04.2020 +ironic_git_install_branch: d1ea36bcecfcf7073a404b3074cebd1f38313d74 # HEAD as of 19.05.2020 ironic_git_project_group: ironic_all -ironic_git_track_branch: master +ironic_git_track_branch: stable/ussuri ## Magnum service magnum_git_repo: https://opendev.org/openstack/magnum -magnum_git_install_branch: 74bfcca3b961b4550cd8f411d9799dfa136738fe # HEAD as of 19.04.2020 +magnum_git_install_branch: f8a89b1bb6ef04e0eaa45b5d7c3006f431c3c544 # HEAD as of 19.05.2020 magnum_git_project_group: magnum_all -magnum_git_track_branch: master +magnum_git_track_branch: stable/ussuri ## Masakari service masakari_git_repo: https://opendev.org/openstack/masakari -masakari_git_install_branch: 9a59610643805f121279519045ff29640fade749 # HEAD as of 19.04.2020 +masakari_git_install_branch: 7c294255bae303fcde2c95f4a5052f35d78b5351 # HEAD as of 19.05.2020 masakari_git_project_group: masakari_api -masakari_git_track_branch: master +masakari_git_track_branch: stable/ussuri ## Masakari monitors services masakari_monitors_git_repo: https://opendev.org/openstack/masakari-monitors -masakari_monitors_git_install_branch: 92c934a8e3c2f726e7f1b845f39c5436d870fd6c # HEAD as of 19.04.2020 +masakari_monitors_git_install_branch: 46ceb118ffe3d627d01b6c6d536d943035a56d3d # HEAD as of 19.05.2020 masakari_monitors_git_project_group: masakari_monitor -masakari_monitors_git_track_branch: master +masakari_monitors_git_track_branch: stable/ussuri ## Mistral service mistral_git_repo: https://opendev.org/openstack/mistral -mistral_git_install_branch: c90472d3e60ce7d26afdc0f1c080a41e104e62e9 # HEAD as of 19.04.2020 +mistral_git_install_branch: e049c5014a634e37dd3108b27de9e582ead499fb # HEAD as of 19.05.2020 mistral_git_project_group: mistral_all -mistral_git_track_branch: master +mistral_git_track_branch: stable/ussuri ## Murano service murano_git_repo: https://opendev.org/openstack/murano -murano_git_install_branch: f3f2a4019acd7fe72011a1311af395ad2f1f16bb # HEAD as of 19.04.2020 +murano_git_install_branch: 4cbbf56b3bf374459137bb0a3832f89820296082 # HEAD as of 19.05.2020 murano_git_project_group: murano_all -murano_git_track_branch: master +murano_git_track_branch: stable/ussuri ## Trove service trove_git_repo: https://opendev.org/openstack/trove -trove_git_install_branch: 8c3df10aa53ca78f764c2580dc99793af03f88b9 # HEAD as of 19.04.2020 +trove_git_install_branch: a006dc41fb0925209f7cdb1d2547ddeee7510cbf # HEAD as of 19.05.2020 trove_git_project_group: trove_all -trove_git_track_branch: master +trove_git_track_branch: stable/ussuri ## Horizon Trove dashboard plugin trove_dashboard_git_repo: https://opendev.org/openstack/trove-dashboard -trove_dashboard_git_install_branch: a92ba65de0454fe6676290bf556e6f92108e9ba8 # HEAD as of 19.04.2020 +trove_dashboard_git_install_branch: a92ba65de0454fe6676290bf556e6f92108e9ba8 # HEAD as of 19.05.2020 trove_dashboard_git_project_group: horizon_all -trove_dashboard_git_track_branch: master +trove_dashboard_git_track_branch: stable/ussuri ## Octavia service octavia_git_repo: https://opendev.org/openstack/octavia -octavia_git_install_branch: 1b52ccd20ff2f41f728b2844db435978bf4f1a8c # HEAD as of 19.04.2020 +octavia_git_install_branch: 0636cd1b43e5a2902ee51a7a8553061fcec9ae73 # HEAD as of 19.05.2020 octavia_git_project_group: octavia_all -octavia_git_track_branch: master +octavia_git_track_branch: stable/ussuri ## Panko service panko_git_repo: https://opendev.org/openstack/panko -panko_git_install_branch: 679e39587d3895d951954b084dd69816f79ef3e9 # HEAD as of 19.04.2020 +panko_git_install_branch: 4e8597a1494459dc2d999aab40b4a4cdc409e1ac # HEAD as of 19.05.2020 panko_git_project_group: panko_all -panko_git_track_branch: master +panko_git_track_branch: stable/ussuri ## Placement service placement_git_repo: https://opendev.org/openstack/placement -placement_git_install_branch: 0f90d197e11d7aa605c0e1d338db1d146a00d8eb # HEAD as of 19.04.2020 +placement_git_install_branch: 6ee154e6ffe8c6096905fc5fc5338029d88546d3 # HEAD as of 19.05.2020 placement_git_project_group: placement_all -placement_git_track_branch: master +placement_git_track_branch: stable/ussuri ## Tacker service tacker_git_repo: https://opendev.org/openstack/tacker -tacker_git_install_branch: 06e78de9fe2dec6ce638585ad44a9e12e7a51e3f # HEAD as of 19.04.2020 +tacker_git_install_branch: 5783b9fff46544e1d50f1d3eafc254095f9f9b99 # HEAD as of 19.05.2020 tacker_git_project_group: tacker_all -tacker_git_track_branch: master +tacker_git_track_branch: stable/ussuri ## Congress service congress_git_repo: https://opendev.org/openstack/congress -congress_git_install_branch: 85243abf63dfc7c086e28e9bdb3fb0b7c9d2ad94 # HEAD as of 19.04.2020 +congress_git_install_branch: 85243abf63dfc7c086e28e9bdb3fb0b7c9d2ad94 # HEAD as of 19.05.2020 congress_git_package_name: openstack-congress congress_git_project_group: congress_all -congress_git_track_branch: master +congress_git_track_branch: stable/ussuri ## Horizon Octavia dashboard plugin octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard -octavia_dashboard_git_install_branch: 761408e3b83712baa7ca281ab1685255d70b13c3 # HEAD as of 19.04.2020 +octavia_dashboard_git_install_branch: 57e9ea7ffd8867c3fc48e1d8f82390fe5e634e0c # HEAD as of 19.05.2020 octavia_dashboard_git_project_group: horizon_all -octavia_dashboard_git_track_branch: master +octavia_dashboard_git_track_branch: stable/ussuri ## Blazar service blazar_git_repo: https://opendev.org/openstack/blazar -blazar_git_install_branch: 738f22c4a9dc2ea30757ee42f12abebe900ea68b # HEAD as of 19.04.2020 +blazar_git_install_branch: 1eea940ede0f0d828069569e418cc848c515abe8 # HEAD as of 19.05.2020 blazar_git_project_group: blazar_all -blazar_git_track_branch: master +blazar_git_track_branch: stable/ussuri ## Blazar Nova Service blazar_nova_git_repo: https://opendev.org/openstack/blazar-nova -blazar_nova_git_install_branch: 9f030ebc27572909b9315f1a6dd88f36c00ae72c # HEAD as of 19.04.2020 +blazar_nova_git_install_branch: 6d9f33cb99dcced4c74eca79385b7b58ac026b15 # HEAD as of 19.05.2020 blazar_nova_git_project_group: blazar_all -blazar_nova_git_track_branch: master +blazar_nova_git_track_branch: stable/ussuri ## Zun service zun_git_repo: https://opendev.org/openstack/zun -zun_git_install_branch: 9f3ebb2130be9d7601a5cf993a64930fde8a8c26 # HEAD as of 19.04.2020 +zun_git_install_branch: 261ae9637aa05e4a9b57ec7f3bc5f962383227d3 # HEAD as of 19.05.2020 zun_git_project_group: zun_all -zun_git_track_branch: master +zun_git_track_branch: stable/ussuri ## Zun kyrir service zun_kuryr_git_repo: https://opendev.org/openstack/kuryr-libnetwork -zun_kuryr_git_install_branch: d63d664b284923b27c4091563352e2dae0531be2 # HEAD as of 19.04.2020 +zun_kuryr_git_install_branch: 080cd178566f2aba82aa2548c6e2ddacda4be054 # HEAD as of 19.05.2020 zun_kuryr_git_project_group: zun_all -zun_kuryr_git_track_branch: master +zun_kuryr_git_track_branch: stable/ussuri diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml deleted file mode 100644 index 945d45515c..0000000000 --- a/playbooks/defaults/repo_packages/openstack_testing.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Copyright 2018, Jean-Philippe Evrard -# -# 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: 414f2116a00e2c260191f7624a7273832fad212b # HEAD as of 19.04.2020 -tempest_git_project_group: utility_all -tempest_git_track_branch: master diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml index bb31005a0d..fc82283c94 100644 --- a/playbooks/os-tempest-install.yml +++ b/playbooks/os-tempest-install.yml @@ -19,7 +19,6 @@ user: root vars_files: - "defaults/repo_packages/openstack_services.yml" - - "defaults/repo_packages/openstack_testing.yml" - "defaults/{{ install_method }}_install.yml" pre_tasks: - name: End playbook diff --git a/releasenotes/notes/certbot_ha-83b56aed3f360dba.yaml b/releasenotes/notes/certbot_ha-83b56aed3f360dba.yaml new file mode 100644 index 0000000000..c276ea6890 --- /dev/null +++ b/releasenotes/notes/certbot_ha-83b56aed3f360dba.yaml @@ -0,0 +1,11 @@ +--- +features: + - | + Multiple HAProxy nodes can now be deployed in an HA configuration with + keepalived and LetsEncrypt certificates. Certbot can be treated as a + backend service for haproxy and acme-challenge requests from LetsEncrypt + can be directed to whichever HAProxy server is running a certificate + renewal. New variables are defined for frontend ACLs and options + to be passed to Certbot which enable this new feature, but the majority + of the required configuration is done via the existing HAProxy service + setup. An example is provided in the documentation. diff --git a/releasenotes/notes/combine-client-d6b135b9957d55ee.yaml b/releasenotes/notes/combine-client-d6b135b9957d55ee.yaml new file mode 100644 index 0000000000..898767d12d --- /dev/null +++ b/releasenotes/notes/combine-client-d6b135b9957d55ee.yaml @@ -0,0 +1,17 @@ +--- +features: + - | + The galera_server role now includes the functionality from the + galera_client role, and can optionally install the client and server + components. This is controlled using two booleans, galera_install_server + and galera_install_client, both of which default to false. +upgrade: + - | + The galera_server role now includes the functionality from the + galera_client role, and as a result a number of the variables from + the galera_client defaults are now available to override in the + galera_server role defaults. In addition, a number of default variables + have been generalised, removing the specific `_client_` or `_server_` + parts of the names. Users of this role should check that any overrides + they are using have the correct variables names for the new combined + role. diff --git a/releasenotes/notes/fedora-latest-support-bf58ecd96cc8fbd4.yaml b/releasenotes/notes/fedora-latest-support-bf58ecd96cc8fbd4.yaml new file mode 100644 index 0000000000..aaf5b416c9 --- /dev/null +++ b/releasenotes/notes/fedora-latest-support-bf58ecd96cc8fbd4.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + Fedora is no longer tested in CI for each commit. diff --git a/releasenotes/notes/rabbit_install_method-b1defcd376f3bf87.yaml b/releasenotes/notes/rabbit_install_method-b1defcd376f3bf87.yaml new file mode 100644 index 0000000000..d2ceb69d34 --- /dev/null +++ b/releasenotes/notes/rabbit_install_method-b1defcd376f3bf87.yaml @@ -0,0 +1,13 @@ +--- +deprecations: + - | + `rabbitmq_install_method: file` is deprecated now and will be removed in + the Wallaby release. As for now supported options are only `external_repo` + and `distro`. Among with that the following variables are deprecated and + prepared for the removal: + + * rabbitmq_package_url + * rabbitmq_package_sha256 + * rabbitmq_package_path + + Variable `rabbitmq_release_version` has been removed as not used anymore. diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh index 0ffcfa7952..57eb1caa36 100755 --- a/scripts/run-upgrade.sh +++ b/scripts/run-upgrade.sh @@ -31,10 +31,10 @@ export SCRIPTS_PATH="$(dirname "$(readlink -f "${0}")")" export MAIN_PATH="$(dirname "${SCRIPTS_PATH}")" # The expected source series name -export SOURCE_SERIES="stein" +export SOURCE_SERIES="train" # The expected target series name -export TARGET_SERIES="train" +export TARGET_SERIES="ussuri" ## Functions -----------------------------------------------------------------