From ac43c0ce9442184c7041146c6d4fddd1fcbf9d36 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 18 Dec 2020 11:44:51 +0200 Subject: [PATCH] Bump OSA for RC1 Depends-On: https://review.opendev.org/767686 Change-Id: I544c3df90d0d378b70d4cd90208fe5097ed8582d --- ansible-role-requirements.yml | 244 +++++++++--------- .../repo_packages/openstack_testing.yml | 22 -- playbooks/os-tempest-install.yml | 1 - .../add_allowed_hosts-38036c7457afc255.yaml | 7 + ...end-only-haproxy_raw-d55ad3baa8d006f3.yaml | 8 + 5 files changed, 137 insertions(+), 145 deletions(-) delete mode 100644 playbooks/defaults/repo_packages/openstack_testing.yml create mode 100644 releasenotes/notes/add_allowed_hosts-38036c7457afc255.yaml create mode 100644 releasenotes/notes/haproxy-frontend-only-haproxy_raw-d55ad3baa8d006f3.yaml diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index c1cf9be9a5..652e3e01c1 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -1,330 +1,330 @@ - name: ansible-hardening scm: git src: https://opendev.org/openstack/ansible-hardening - version: master - trackbranch: master + version: 4e44a54b95b76fec380d1bbdf82a939b025a128d + trackbranch: stable/victoria - name: apt_package_pinning scm: git src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning - version: master - trackbranch: master + version: 479d188c29bf9ca6b2b7500c13f5f695f8008ee6 + trackbranch: stable/victoria - name: config_template scm: git src: https://opendev.org/openstack/ansible-config_template - version: master - trackbranch: master + version: a6347c381154deab33aca49188bea1992dc179ce + trackbranch: stable/victoria - name: galera_server scm: git src: https://opendev.org/openstack/openstack-ansible-galera_server - version: master - trackbranch: master + version: 0b853b1da7802f6fac8da309c88886186f6a15a6 + trackbranch: stable/victoria - name: ceph_client scm: git src: https://opendev.org/openstack/openstack-ansible-ceph_client - version: master - trackbranch: master + version: f0c208fcb2383a190622a000ce0fa9f40becea02 + trackbranch: stable/victoria - name: haproxy_server scm: git src: https://opendev.org/openstack/openstack-ansible-haproxy_server - version: master - trackbranch: master + version: ca2c011cf23a4bcdf469b6c9d07f6956204448dd + trackbranch: stable/victoria - name: keepalived scm: git src: https://github.com/evrardjp/ansible-keepalived - version: master + version: 399654cc70d58bc60376f7dd4eb9d0e8db2605d8 trackbranch: master - name: lxc_container_create scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_container_create - version: master - trackbranch: master + version: b4d4f858bb29e297ece13c307ece71441aff5a23 + trackbranch: stable/victoria - name: lxc_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_hosts - version: master - trackbranch: master + version: b3bff3289ac2e9510be81f562f6d35500ac47723 + trackbranch: stable/victoria - name: memcached_server scm: git src: https://opendev.org/openstack/openstack-ansible-memcached_server - version: master - trackbranch: master + version: 2bb11b1b1baceb19f465d7c387db6d18c3592317 + trackbranch: stable/victoria - name: openstack_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-openstack_hosts - version: master - trackbranch: master + version: 8ab8503a15ad5cfe504777647922be301ddac911 + trackbranch: stable/victoria - name: os_keystone scm: git src: https://opendev.org/openstack/openstack-ansible-os_keystone - version: master - trackbranch: master + version: f1625b38a820dd51cffa66141053a836211695dc + trackbranch: stable/victoria - name: openstack_openrc scm: git src: https://opendev.org/openstack/openstack-ansible-openstack_openrc - version: master - trackbranch: master + version: 242772e99978fe9cd3c50b5b40d5637833f38beb + trackbranch: stable/victoria - name: os_adjutant scm: git src: https://opendev.org/openstack/openstack-ansible-os_adjutant - version: master - trackbranch: master + version: 8a4c92ee7eb22aa4d9511760970bb11453a49736 + trackbranch: stable/victoria - name: os_aodh scm: git src: https://opendev.org/openstack/openstack-ansible-os_aodh - version: master - trackbranch: master + version: 13ef8fa191c283c4f85579b1b7a5f884594119af + trackbranch: stable/victoria - name: os_barbican scm: git src: https://opendev.org/openstack/openstack-ansible-os_barbican - version: master - trackbranch: master + version: ddf65cdc3ef44b534cbbb713ae5228368ec31855 + trackbranch: stable/victoria - name: os_blazar scm: git src: https://opendev.org/openstack/openstack-ansible-os_blazar - version: master - trackbranch: master + version: 740806fa1dc4a12c4a75b31c93ce6125b5627e38 + trackbranch: stable/victoria - name: os_ceilometer scm: git src: https://opendev.org/openstack/openstack-ansible-os_ceilometer - version: master - trackbranch: master + version: 6df1fb0fc5610c2f317b5085188b0a60346e7111 + trackbranch: stable/victoria - name: os_cinder scm: git src: https://opendev.org/openstack/openstack-ansible-os_cinder - version: master - trackbranch: master + version: 00a38c6584c09168faad135f10d265ad9c86efba + trackbranch: stable/victoria - name: os_cloudkitty scm: git src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty - version: master - trackbranch: master + version: 26f5180a9a2462acde8d65156b09521060e40852 + trackbranch: stable/victoria - name: os_designate scm: git src: https://opendev.org/openstack/openstack-ansible-os_designate - version: master - trackbranch: master + version: 2e553218499594e02602f51b9b5cfdeab79f9cb5 + trackbranch: stable/victoria - name: os_glance scm: git src: https://opendev.org/openstack/openstack-ansible-os_glance - version: master - trackbranch: master + version: 7c9b4258fa6f9288fff25b219e88cb0c9ddfb3c0 + trackbranch: stable/victoria - name: os_gnocchi scm: git src: https://opendev.org/openstack/openstack-ansible-os_gnocchi - version: master - trackbranch: master + version: b73d93efd095b94f3983ff7f3a057deadcededb3 + trackbranch: stable/victoria - name: os_heat scm: git src: https://opendev.org/openstack/openstack-ansible-os_heat - version: master - trackbranch: master + version: 7d14b4e76b2e1b73654f8bfd5b498dfca5954aa5 + trackbranch: stable/victoria - name: os_horizon scm: git src: https://opendev.org/openstack/openstack-ansible-os_horizon - version: master - trackbranch: master + version: 8e3570e0020168afafd4279f27fd6640cca07b7f + trackbranch: stable/victoria - name: os_ironic scm: git src: https://opendev.org/openstack/openstack-ansible-os_ironic - version: master - trackbranch: master + version: 67733c8f0cb13c467eb10f256a93d878c56d4743 + trackbranch: stable/victoria - name: os_magnum scm: git src: https://opendev.org/openstack/openstack-ansible-os_magnum - version: master - trackbranch: master + version: 2ba7654fe687ec680f71cc96970e42de41937cd4 + trackbranch: stable/victoria - name: os_manila scm: git src: https://opendev.org/openstack/openstack-ansible-os_manila - version: master - trackbranch: master + version: dfc29c7bac76f4523e6fb29138629d4212d40266 + trackbranch: stable/victoria - name: os_masakari scm: git src: https://opendev.org/openstack/openstack-ansible-os_masakari - version: master - trackbranch: master + version: 9cd72c1ad374bb6b6bc113d797d72c9aa44e1e22 + trackbranch: stable/victoria - name: os_mistral scm: git src: https://opendev.org/openstack/openstack-ansible-os_mistral - version: master - trackbranch: master + version: fc31f37f696ed27d6b2bd0c3cb3c9220d460f917 + trackbranch: stable/victoria - name: os_murano scm: git src: https://opendev.org/openstack/openstack-ansible-os_murano - version: master - trackbranch: master + version: 5e0a408fdb89ff2d5a0fe890230e083113e89451 + trackbranch: stable/victoria - name: os_neutron scm: git src: https://opendev.org/openstack/openstack-ansible-os_neutron - version: master - trackbranch: master + version: 98b3af136a05b79b49c19407b940223430260eef + trackbranch: stable/victoria - name: os_nova scm: git src: https://opendev.org/openstack/openstack-ansible-os_nova - version: master - trackbranch: master + version: 43b1b62f22b47e3148adcc4cd2396a4e29522e9b + trackbranch: stable/victoria - name: os_octavia scm: git src: https://opendev.org/openstack/openstack-ansible-os_octavia - version: master - trackbranch: master + version: 3f7a572ebeae9ee76679c0cecb4ffaa0fa552fc3 + trackbranch: stable/victoria - name: os_panko scm: git src: https://opendev.org/openstack/openstack-ansible-os_panko - version: master - trackbranch: master + version: 518112a014c0784106accd5ea27f27fd901351ea + trackbranch: stable/victoria - name: os_placement scm: git src: https://opendev.org/openstack/openstack-ansible-os_placement - version: master - trackbranch: master + version: bf42c4a4038d7743df5134f41f803f26c3cdbd90 + trackbranch: stable/victoria - name: os_rally scm: git src: https://opendev.org/openstack/openstack-ansible-os_rally - version: master - trackbranch: master + version: 77944eef30ac0a248743e4c0edc6f2773cf7100e + trackbranch: stable/victoria - name: os_sahara scm: git src: https://opendev.org/openstack/openstack-ansible-os_sahara - version: master - trackbranch: master + version: 0f9e76292461a5532f6d43927b71ab9fff692dd5 + trackbranch: stable/victoria - name: os_senlin scm: git src: https://opendev.org/openstack/openstack-ansible-os_senlin - version: master - trackbranch: master + version: 34105b0a94a0ad4148a4a9a0dc26aa304b354de6 + trackbranch: stable/victoria - name: os_swift scm: git src: https://opendev.org/openstack/openstack-ansible-os_swift - version: master - trackbranch: master + version: 58e003f44e1dba26c5fa8457cd1a41c88a1a2bb9 + trackbranch: stable/victoria - name: os_tacker scm: git src: https://opendev.org/openstack/openstack-ansible-os_tacker - version: master - trackbranch: master + version: e971939b55f1d9aeaeb04b030d72397b6dcaf2ed + trackbranch: stable/victoria - name: os_tempest scm: git src: https://opendev.org/openstack/openstack-ansible-os_tempest - version: master - trackbranch: master + version: 49004fb05fa491275848a07020a36d4264ab6d49 + trackbranch: stable/victoria - name: os_trove scm: git src: https://opendev.org/openstack/openstack-ansible-os_trove - version: master - trackbranch: master + version: f37cb8868032b86fbc6aa843321c00b10441eafd + trackbranch: stable/victoria - name: os_zun scm: git src: https://opendev.org/openstack/openstack-ansible-os_zun - version: master - trackbranch: master + version: 07d78458207156378406db2f8cb7a6140c047b47 + trackbranch: stable/victoria - name: plugins scm: git src: https://opendev.org/openstack/openstack-ansible-plugins - version: master - trackbranch: master + version: 0b2981a5b59d95302315a89b2dfc65badf618e65 + trackbranch: stable/victoria - name: qdrouterd scm: git src: https://opendev.org/openstack/ansible-role-qdrouterd - version: master - trackbranch: master + version: 2b7b2ada9fc0ce7c0ca5508f6432627dc70edbac + trackbranch: stable/victoria - name: rabbitmq_server scm: git src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server - version: master - trackbranch: master + version: e93b7e3477c1e1d6767c447211bb70dbe023e3a8 + trackbranch: stable/victoria - name: repo_server scm: git src: https://opendev.org/openstack/openstack-ansible-repo_server - version: master - trackbranch: master + version: 64c683aa13c509c7b030069388d98706f4644726 + trackbranch: stable/victoria - name: rsyslog_client scm: git src: https://opendev.org/openstack/openstack-ansible-rsyslog_client - version: master - trackbranch: master + version: d616af7883bd6e7a208be3a4f56d129bc2aa92ca + trackbranch: stable/victoria - name: rsyslog_server scm: git src: https://opendev.org/openstack/openstack-ansible-rsyslog_server - version: master - trackbranch: master + version: d52263304292da2f207f4368625ac44c89f89521 + trackbranch: stable/victoria - name: sshd scm: git src: https://github.com/bengoa/ansible-sshd - version: master + version: 61587d5d88ce98deed989ab702af84bff0f037bf trackbranch: master - name: bird scm: git src: https://github.com/logan2211/ansible-bird - version: master + version: 9e5a7d7fc8b72ad4aa73280a7638b0554cf20d5c trackbranch: master - name: etcd scm: git src: https://github.com/logan2211/ansible-etcd - version: master + version: ab9861e35c23342fa30c703d29e370da590ea582 trackbranch: master - name: unbound scm: git src: https://github.com/logan2211/ansible-unbound - version: master + version: f8e2d8a89ddb9352d5748332a5f3a33ed33f66ab trackbranch: master - name: resolvconf scm: git src: https://github.com/logan2211/ansible-resolvconf - version: master + version: a2ff5ba59b47f96ddddcb7a3a67de93687c317a6 trackbranch: master - name: ceph-ansible scm: git src: https://github.com/ceph/ceph-ansible - version: stable-5.0 + version: 7d088320df1c4a6ed458866c61616a21fddccfe8 trackbranch: stable-5.0 - name: opendaylight scm: git src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight - version: master + version: 4a9217ed0fe9078152435daaa2d3f45b81021b3a trackbranch: master - name: haproxy_endpoints scm: git src: https://github.com/logan2211/ansible-haproxy-endpoints - version: master + version: 8e3a24a35beb16d717072dc83895c5a1f92689fb trackbranch: master - name: pacemaker_corosync scm: git src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync trackbranch: master - version: master + version: 7ae17fbd39885e0b37383e6d192d25e54d8554c8 - name: nspawn_container_create src: https://opendev.org/openstack/openstack-ansible-nspawn_container_create scm: git - version: master - trackbranch: master + version: e20e45fd41daa8374863a47bec8bed3a1e496a6a + trackbranch: stable/victoria - name: nspawn_hosts src: https://opendev.org/openstack/openstack-ansible-nspawn_hosts scm: git - version: master - trackbranch: master + version: cb736cbc023382ef792465b7d6b3b89797446a25 + trackbranch: stable/victoria - name: systemd_service src: https://opendev.org/openstack/ansible-role-systemd_service scm: git - version: master - trackbranch: master + version: 2abd4c9be81709068770c3115a3db89a1cfad139 + trackbranch: stable/victoria - name: systemd_mount src: https://opendev.org/openstack/ansible-role-systemd_mount scm: git - version: master - trackbranch: master + version: bcbd5344cf56338adea03ad3ef41466fd8615e70 + trackbranch: stable/victoria - name: systemd_networkd src: https://opendev.org/openstack/ansible-role-systemd_networkd scm: git - version: master - trackbranch: master + version: 48a217bf2d8f1416541c92b44cbc80518013f322 + trackbranch: stable/victoria - name: python_venv_build src: https://opendev.org/openstack/ansible-role-python_venv_build scm: git - version: master - trackbranch: master + version: 2cb805baff2af142099ba692cac047ae963493b1 + trackbranch: stable/victoria - name: uwsgi src: https://opendev.org/openstack/ansible-role-uwsgi scm: git - version: master - trackbranch: master + version: 50a941f55294be4c7fffc77f6bcf99d9ff62a1d5 + trackbranch: stable/victoria diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml deleted file mode 100644 index 78ad20f578..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: 5364a9a789715773b48b0b359fec6807e2360e3d # HEAD as of 13.12.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 aacf7785f8..4942dd4864 100644 --- a/playbooks/os-tempest-install.yml +++ b/playbooks/os-tempest-install.yml @@ -25,7 +25,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/add_allowed_hosts-38036c7457afc255.yaml b/releasenotes/notes/add_allowed_hosts-38036c7457afc255.yaml new file mode 100644 index 0000000000..0c0a660d05 --- /dev/null +++ b/releasenotes/notes/add_allowed_hosts-38036c7457afc255.yaml @@ -0,0 +1,7 @@ +--- +features: + - Add ``horizon_allowed_hosts`` to be able to configure django ALLOWED_HOSTS. + The default is still the same as it was but you can create a list of allowed + hosts in ``/etc/openstack_deploy/user_variables.yml``. to set the correct + value, see https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts + for more details. diff --git a/releasenotes/notes/haproxy-frontend-only-haproxy_raw-d55ad3baa8d006f3.yaml b/releasenotes/notes/haproxy-frontend-only-haproxy_raw-d55ad3baa8d006f3.yaml new file mode 100644 index 0000000000..34cb23aa59 --- /dev/null +++ b/releasenotes/notes/haproxy-frontend-only-haproxy_raw-d55ad3baa8d006f3.yaml @@ -0,0 +1,8 @@ +--- +features: + - It is now possible to have a service which only have a frontend. + by using `haproxy_frontend_only` inside your service. + - Add the possibility to have a haproxy_frontend_raw entry to control + haproxy config for the frontend, the entry will be literally copied in + to the service. You can set a list under the key `haproxy_frontend_raw` +