From bd801990db7ad0365dbe18cd84519caee21ff3c7 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Fri, 4 Oct 2019 13:09:22 +0200 Subject: [PATCH] Create Train This effectively: - Freeze roles, to allow their branching. - Bump upstream repos to point to their Train equivalent, allowing our regular updates to continue with train. Depends-On: https://review.opendev.org/690541 Change-Id: If2fc9b36c7323be914111e2c93d1d0d10648f65c --- ansible-role-requirements.yml | 124 ++++++------- global-requirement-pins.txt | 6 +- playbooks/defaults/repo_packages/gnocchi.yml | 2 +- .../defaults/repo_packages/nova_consoles.yml | 2 +- .../repo_packages/openstack_services.yml | 174 +++++++++--------- .../repo_packages/openstack_testing.yml | 22 --- playbooks/os-tempest-install.yml | 1 - .../app-credentials-709e7ae0573b4955.yaml | 7 + .../centos-private-epel-3fe4c9ff68ec3a18.yaml | 6 + ...zon_haproxy_conflict-27955d6b7c1a6d30.yaml | 10 + 10 files changed, 177 insertions(+), 177 deletions(-) delete mode 100644 playbooks/defaults/repo_packages/openstack_testing.yml create mode 100644 releasenotes/notes/app-credentials-709e7ae0573b4955.yaml create mode 100644 releasenotes/notes/centos-private-epel-3fe4c9ff68ec3a18.yaml create mode 100644 releasenotes/notes/horizon_haproxy_conflict-27955d6b7c1a6d30.yaml diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 543a4296e2..d70bb394cc 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -1,310 +1,310 @@ - name: ansible-hardening scm: git src: https://opendev.org/openstack/ansible-hardening - version: master + version: 9cfc60f3072558e54231d978e5c49b514ffcfa03 trackbranch: master - name: apt_package_pinning scm: git src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning - version: master + version: c469744a99fc8c6f13af2692df46c920d46d9693 trackbranch: master - name: config_template scm: git src: https://opendev.org/openstack/ansible-config_template - version: master + version: faf60ddb53dd3d345ea3644f818805a3d356b104 trackbranch: master - name: galera_client scm: git src: https://opendev.org/openstack/openstack-ansible-galera_client - version: master + version: c0f11db478985619cab26b8a6b3193cb86b7fcaa trackbranch: master - name: galera_server scm: git src: https://opendev.org/openstack/openstack-ansible-galera_server - version: master + version: 7132d760bee431635855559596803a6f80aa3090 trackbranch: master - name: ceph_client scm: git src: https://opendev.org/openstack/openstack-ansible-ceph_client - version: master + version: 21f85fae9a8d3113137acef81c728fd347688d7a trackbranch: master - name: haproxy_server scm: git src: https://opendev.org/openstack/openstack-ansible-haproxy_server - version: master + version: 500398b8195fed344ed376f7c518e8cf7bae56c2 trackbranch: master - name: keepalived scm: git src: https://github.com/evrardjp/ansible-keepalived - version: master + version: 8bbfc283d9bc07fb7ae63168844a01146d4f8697 trackbranch: master - name: lxc_container_create scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_container_create - version: master + version: a53247e5a8177f77a575196502396fd0012a5c74 trackbranch: master - name: lxc_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_hosts - version: master + version: 23c6e8525986b0635f0d8c55a3757ec57fb1b29e trackbranch: master - name: memcached_server scm: git src: https://opendev.org/openstack/openstack-ansible-memcached_server - version: master + version: 88bc0fade74cb2eae04ff50e6b11b1e326bf66de trackbranch: master - name: openstack_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-openstack_hosts - version: master + version: d71b439ba2708dc333a2733dbc1a828ee75b4137 trackbranch: master - name: os_keystone scm: git src: https://opendev.org/openstack/openstack-ansible-os_keystone - version: master + version: aac229121fe87422b018716f6e04ad235d8a695e trackbranch: master - name: openstack_openrc scm: git src: https://opendev.org/openstack/openstack-ansible-openstack_openrc - version: master + version: c24af1a2b9c228e2b0a3b54d5e70fed3ca35217d trackbranch: master - name: os_aodh scm: git src: https://opendev.org/openstack/openstack-ansible-os_aodh - version: master + version: b633e2127bf3e548a73155e7d3598adb52f60aa4 trackbranch: master - name: os_barbican scm: git src: https://opendev.org/openstack/openstack-ansible-os_barbican - version: master + version: 1c6095ff02e2c19cc7445ad5fc485e366fcbbaaa trackbranch: master - name: os_blazar scm: git src: https://opendev.org/openstack/openstack-ansible-os_blazar - version: master + version: 23ed64b6fce0af1ba9e6290a1fdd8544ea98e089 trackbranch: master - name: os_ceilometer scm: git src: https://opendev.org/openstack/openstack-ansible-os_ceilometer - version: master + version: 9906ecd5bdf592a2233ffdcce4bcc35931488724 trackbranch: master - name: os_cinder scm: git src: https://opendev.org/openstack/openstack-ansible-os_cinder - version: master + version: 402f4f43f4401539c6ba8354ec4e39802abca891 trackbranch: master - name: os_congress scm: git src: https://opendev.org/openstack/openstack-ansible-os_congress - version: master + version: 6ff69c6f5632f00258e06f137b3cd83c1e31ac47 trackbranch: master - name: os_designate scm: git src: https://opendev.org/openstack/openstack-ansible-os_designate - version: master + version: 629a0e00cbe2ca8836c52d90036fe249d2426519 trackbranch: master - name: os_glance scm: git src: https://opendev.org/openstack/openstack-ansible-os_glance - version: master + version: d1c03539b8e4969a27047c416de09a835945dd9d trackbranch: master - name: os_gnocchi scm: git src: https://opendev.org/openstack/openstack-ansible-os_gnocchi - version: master + version: e4babdd7c838e3a26c15daa84c9c0f0391c307d8 trackbranch: master - name: os_heat scm: git src: https://opendev.org/openstack/openstack-ansible-os_heat - version: master + version: 728666c9de1f835ecc2648a2a1abb43e47501031 trackbranch: master - name: os_horizon scm: git src: https://opendev.org/openstack/openstack-ansible-os_horizon - version: master + version: b7d1f7e26115758507e649e8542cc9d126fe152e trackbranch: master - name: os_ironic scm: git src: https://opendev.org/openstack/openstack-ansible-os_ironic - version: master + version: 089a1bd3455052be2f0b65cffda814bafc8933f7 trackbranch: master - name: os_magnum scm: git src: https://opendev.org/openstack/openstack-ansible-os_magnum - version: master + version: abb576246cfa2802719914355e35928ec85a6ec2 trackbranch: master - name: os_manila scm: git src: https://opendev.org/openstack/openstack-ansible-os_manila - version: master + version: acc94725e34122496b602709213a5eef9c8e8690 trackbranch: master - name: os_masakari scm: git src: https://opendev.org/openstack/openstack-ansible-os_masakari - version: master + version: f5c1defc5a7387dee55470f18d7195937fb014c0 trackbranch: master - name: os_mistral scm: git src: https://opendev.org/openstack/openstack-ansible-os_mistral - version: master + version: fd002ac32bf989f90d1614dfb93b4848d4ff001d trackbranch: master - name: os_neutron scm: git src: https://opendev.org/openstack/openstack-ansible-os_neutron - version: master + version: 2f1b789e06b3e91201ca312c81c9d2a17fc322f8 trackbranch: master - name: os_nova scm: git src: https://opendev.org/openstack/openstack-ansible-os_nova - version: master + version: 8bd5fda366680682163aad65bce02deab36c436b trackbranch: master - name: os_octavia scm: git src: https://opendev.org/openstack/openstack-ansible-os_octavia - version: master + version: 942a245af6cea7de2c056ad1fe6178b61a812908 trackbranch: master - name: os_panko scm: git src: https://opendev.org/openstack/openstack-ansible-os_panko - version: master + version: bf7140aa240537d0964c32b6a3b36ff2b2a98d07 trackbranch: master - name: os_placement scm: git src: https://opendev.org/openstack/openstack-ansible-os_placement - version: master + version: 34d33864b67da87f3d5659bacbaaa71264e59d20 trackbranch: master - name: os_rally scm: git src: https://opendev.org/openstack/openstack-ansible-os_rally - version: master + version: 2e31110da3c2bbd520b94c4a9c2d454b00f8b268 trackbranch: master - name: os_sahara scm: git src: https://opendev.org/openstack/openstack-ansible-os_sahara - version: master + version: 1f404d558cfb1235dc7e5c91cefba3ee390081dc trackbranch: master - name: os_swift scm: git src: https://opendev.org/openstack/openstack-ansible-os_swift - version: master + version: 97790114dc89ed1b726b396dc37a2240b2508350 trackbranch: master - name: os_tacker scm: git src: https://opendev.org/openstack/openstack-ansible-os_tacker - version: master + version: fbb709dc96909697ae28b7a4c4bfcfa2beb4f19e trackbranch: master - name: os_tempest scm: git src: https://opendev.org/openstack/openstack-ansible-os_tempest - version: master + version: 5e554a3fdfb7f33386ea1cf41b4d2267d55dcd2c trackbranch: master - name: os_trove scm: git src: https://opendev.org/openstack/openstack-ansible-os_trove - version: master + version: 96821b4ba9ceda23d990422fda508f65be23242d trackbranch: master - name: plugins scm: git src: https://opendev.org/openstack/openstack-ansible-plugins - version: master + version: 24fe4789c89ca822bea3b3f01fa889f6b32002e4 trackbranch: master - name: qdrouterd scm: git src: https://opendev.org/openstack/ansible-role-qdrouterd - version: master + version: 99d0f00060b67498b20e8e7588156592dfa427ec trackbranch: master - name: rabbitmq_server scm: git src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server - version: master + version: 2332b70d4d1eec224aa833848fd2e7803ef07257 trackbranch: master - name: repo_server scm: git src: https://opendev.org/openstack/openstack-ansible-repo_server - version: master + version: 03ce118a8d3a1ddcf41bb8267e2056419bd2e6b5 trackbranch: master - name: rsyslog_client scm: git src: https://opendev.org/openstack/openstack-ansible-rsyslog_client - version: master + version: bd77b290e5112fbffc5983424603764d294b91c5 trackbranch: master - name: rsyslog_server scm: git src: https://opendev.org/openstack/openstack-ansible-rsyslog_server - version: master + version: df00bf7f03858915833bcf1b31b78f9e3f1d76d9 trackbranch: master - name: sshd scm: git src: https://github.com/willshersystems/ansible-sshd - version: master + version: 454bcb828fd645ad5f43e48ee498ca974faca729 trackbranch: master - name: bird scm: git src: https://github.com/logan2211/ansible-bird - version: master + version: c755eb300b12ecb659e92375fa0572efec74846f trackbranch: master - name: etcd scm: git src: https://github.com/logan2211/ansible-etcd - version: master + version: fa1c447b6a979a614fc024725b5ecad215261c4a 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-4.0 + version: 021c55530765395b6291c0befc7feaccb46546ca trackbranch: stable-4.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: nspawn_container_create src: https://opendev.org/openstack/openstack-ansible-nspawn_container_create scm: git - version: master + version: b7861939fe58dd87d386c43a26b584e1a4488bf8 trackbranch: master - name: nspawn_hosts src: https://opendev.org/openstack/openstack-ansible-nspawn_hosts scm: git - version: master + version: 11594a85aeb82159b5f5e267b861c8f6374e50c1 trackbranch: master - name: systemd_service src: https://opendev.org/openstack/ansible-role-systemd_service scm: git - version: master + version: 83bff1a16ff2a182943bdc1c6157ee6b0823ad3f trackbranch: master - name: systemd_mount src: https://opendev.org/openstack/ansible-role-systemd_mount scm: git - version: master + version: 6acf8cb6589ce3e04511c3e8d2484d118c12e8f0 trackbranch: master - name: systemd_networkd src: https://opendev.org/openstack/ansible-role-systemd_networkd scm: git - version: master + version: 658b32023d08e525e7b40b30c1b2dd8e41f9ed71 trackbranch: master - name: python_venv_build src: https://opendev.org/openstack/ansible-role-python_venv_build scm: git - version: master + version: 8e13d0d0144cd5ad45b2ac4cd8381174be435d82 trackbranch: master - name: uwsgi src: https://opendev.org/openstack/ansible-role-uwsgi scm: git - version: master + version: b88d50704b9912011ef039a3c62808c228e4d4b8 trackbranch: master diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt index c736b35291..ae7cc167d7 100644 --- a/global-requirement-pins.txt +++ b/global-requirement-pins.txt @@ -9,6 +9,6 @@ # For idempotency on ubuntu, argparse need to stay at 1.2.1 # See also ChangeId: I8be207c359388d00b34448318bc17c8b0039c4db argparse==1.2.1;python_version=='2.7' -pip==19.1 -setuptools==41.0.1 -wheel==0.33.1 +pip==19.3 +setuptools==41.4.0 +wheel==0.33.6 diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/playbooks/defaults/repo_packages/gnocchi.yml index 5d8e3f5700..ba2cc4ae6f 100644 --- a/playbooks/defaults/repo_packages/gnocchi.yml +++ b/playbooks/defaults/repo_packages/gnocchi.yml @@ -33,6 +33,6 @@ ## 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: 8cbc9ee4c3ff35786fd2d091756e9469abd49e1d # HEAD as of 30.09.2019 +gnocchi_git_install_branch: 8cbc9ee4c3ff35786fd2d091756e9469abd49e1d # HEAD as of 17.10.2019 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 122089b265..2ba14073d6 100644 --- a/playbooks/defaults/repo_packages/nova_consoles.yml +++ b/playbooks/defaults/repo_packages/nova_consoles.yml @@ -37,7 +37,7 @@ novncproxy_git_track_branch: None ## spice-html5 from source spicehtml5_git_repo: https://gitlab.freedesktop.org/spice/spice-html5.git -spicehtml5_git_install_branch: 5fae52199b9726053449007189ab15aba57cffa1 # HEAD as of 30.09.2019 +spicehtml5_git_install_branch: 5fae52199b9726053449007189ab15aba57cffa1 # HEAD as of 17.10.2019 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 e4af2fd9aa..d9d7556f02 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,159 +31,159 @@ ## Global Requirements requirements_git_repo: https://opendev.org/openstack/requirements -requirements_git_install_branch: 34dd20b9caa8463dcdaa50189946930d5b30a2e6 # HEAD as of 30.09.2019 -requirements_git_track_branch: master +requirements_git_install_branch: 5d2dc701ab2fe7e87d78e4d96eb444766eef6725 # HEAD as of 17.10.2019 +requirements_git_track_branch: stable/train ## Aodh service aodh_git_repo: https://opendev.org/openstack/aodh -aodh_git_install_branch: 68f1effa10176a3a08f5ad9fe357e73bb4f33e4f # HEAD as of 30.09.2019 +aodh_git_install_branch: 9e17daad69c65792c8e03d6e39a9601f6972a8c6 # HEAD as of 17.10.2019 aodh_git_project_group: aodh_all -aodh_git_track_branch: master +aodh_git_track_branch: stable/train ## Barbican service barbican_git_repo: https://opendev.org/openstack/barbican -barbican_git_install_branch: 2a6fc155d232763a44ebe886f70fdde2a0030a62 # HEAD as of 30.09.2019 +barbican_git_install_branch: 321158666f431868bea575c7546303bb45c626f4 # HEAD as of 17.10.2019 barbican_git_project_group: barbican_all -barbican_git_track_branch: master +barbican_git_track_branch: stable/train ## Ceilometer service ceilometer_git_repo: https://opendev.org/openstack/ceilometer -ceilometer_git_install_branch: 8288ad511c54a1120fec9dd3ee950df6833272fe # HEAD as of 30.09.2019 +ceilometer_git_install_branch: 7962947310d784fdfccf03512468ee2eec0c9ffa # HEAD as of 17.10.2019 ceilometer_git_project_group: all -ceilometer_git_track_branch: master +ceilometer_git_track_branch: stable/train ## Cinder service cinder_git_repo: https://opendev.org/openstack/cinder -cinder_git_install_branch: 33b32d982094a9d85dabd737cb1d634b3164c187 # HEAD as of 30.09.2019 +cinder_git_install_branch: 293910c8d80b1f91b381f2f2821fa39cac739f3c # HEAD as of 17.10.2019 cinder_git_project_group: cinder_all -cinder_git_track_branch: master +cinder_git_track_branch: stable/train ## Designate service designate_git_repo: https://opendev.org/openstack/designate -designate_git_install_branch: d078b0abf375a93fd56580c380746171d1ec1d39 # HEAD as of 30.09.2019 +designate_git_install_branch: 408a90d941edb969dbdb96e729b8630ef5a339e3 # HEAD as of 17.10.2019 designate_git_project_group: designate_all -designate_git_track_branch: master +designate_git_track_branch: stable/train ## Horizon Designate dashboard plugin designate_dashboard_git_repo: https://opendev.org/openstack/designate-dashboard -designate_dashboard_git_install_branch: 2773f7950efc126055cbf8008eb939229e692827 # HEAD as of 30.09.2019 +designate_dashboard_git_install_branch: f0e33a7de4415ea91ea837d721960434a893145a # HEAD as of 17.10.2019 designate_dashboard_git_project_group: horizon_all -designate_dashboard_git_track_branch: master +designate_dashboard_git_track_branch: stable/train ## Glance service glance_git_repo: https://opendev.org/openstack/glance -glance_git_install_branch: feb8ebd75bfcf1296dfa40e000a4a16eb2082971 # HEAD as of 30.09.2019 +glance_git_install_branch: f87464e022046c9d61384c2593edf9753ed34749 # HEAD as of 17.10.2019 glance_git_project_group: glance_all -glance_git_track_branch: master +glance_git_track_branch: stable/train ## Heat service heat_git_repo: https://opendev.org/openstack/heat -heat_git_install_branch: dbe7e124db5f62c6a9d633e817ffbc94b548ad8f # HEAD as of 30.09.2019 +heat_git_install_branch: 747e4b765840cc2e5ac5d7862d8db7ee500df902 # HEAD as of 17.10.2019 heat_git_package_name: openstack-heat heat_git_project_group: heat_all -heat_git_track_branch: master +heat_git_track_branch: stable/train ## Horizon Heat dashboard plugin heat_dashboard_git_repo: https://opendev.org/openstack/heat-dashboard -heat_dashboard_git_install_branch: 3aebd69743916c2d4b9f79310b75c3a23106b846 # HEAD as of 30.09.2019 +heat_dashboard_git_install_branch: 93076a63e48b2c069dd724e77b9f4303be068a22 # HEAD as of 17.10.2019 heat_dashboard_git_project_group: horizon_all -heat_dashboard_git_track_branch: master # Not branched yet +heat_dashboard_git_track_branch: stable/train # Not branched yet ## Horizon service horizon_git_repo: https://opendev.org/openstack/horizon -horizon_git_install_branch: 4783feea79bb4dd53d48de68983dcbe99e234084 # HEAD as of 30.09.2019 +horizon_git_install_branch: 26c97d910a135d1ab1bd8ecd47f5bd80355b5624 # HEAD as of 17.10.2019 horizon_git_project_group: horizon_all -horizon_git_track_branch: master +horizon_git_track_branch: stable/train ## Horizon Ironic dashboard plugin ironic_dashboard_git_repo: https://opendev.org/openstack/ironic-ui -ironic_dashboard_git_install_branch: 5ae28de53578063995b5174dd712d38a5f9dba15 # HEAD as of 30.09.2019 +ironic_dashboard_git_install_branch: 57c2b37f9b2643699f91fb6cbe6b2baf5f22363e # HEAD as of 17.10.2019 ironic_dashboard_git_project_group: horizon_all -ironic_dashboard_git_track_branch: master +ironic_dashboard_git_track_branch: stable/train ## Horizon Magnum dashboard plugin magnum_dashboard_git_repo: https://opendev.org/openstack/magnum-ui -magnum_dashboard_git_install_branch: 47e0329f52d8d45fdd8f4312ca744789b919f695 # HEAD as of 30.09.2019 +magnum_dashboard_git_install_branch: a6d467e55422baf1cae2480684b257467b9e4451 # HEAD as of 17.10.2019 magnum_dashboard_git_project_group: horizon_all -magnum_dashboard_git_track_branch: master +magnum_dashboard_git_track_branch: stable/train ## Horizon Masakari dashboard plugin masakari_dashboard_git_repo: https://opendev.org/openstack/masakari-dashboard -masakari_dashboard_git_install_branch: 43e557c5b32094b05867343c37d63027e4d8ffcc # HEAD as of 30.09.2019 +masakari_dashboard_git_install_branch: 9ab2779484f99ea01b978db47a56242035113222 # HEAD as of 17.10.2019 masakari_dashboard_git_project_group: horizon_all -masakari_dashboard_git_track_branch: master # Not branched yet +masakari_dashboard_git_track_branch: stable/train # Not branched yet ## Horizon FWaaS dashboard plugin neutron_fwaas_dashboard_git_repo: https://opendev.org/openstack/neutron-fwaas-dashboard -neutron_fwaas_dashboard_git_install_branch: 70495c62952d6d0527aa5b530cbf9abf5e049b6e # HEAD as of 30.09.2019 +neutron_fwaas_dashboard_git_install_branch: a3790e7a169c64059c7729dcaf88485a13fc018e # HEAD as of 17.10.2019 neutron_fwaas_dashboard_git_project_group: horizon_all -neutron_fwaas_dashboard_git_track_branch: master +neutron_fwaas_dashboard_git_track_branch: stable/train ## Horizon Sahara dashboard plugin sahara_dashboard_git_repo: https://opendev.org/openstack/sahara-dashboard -sahara_dashboard_git_install_branch: c3d3f42ac3c798eca26fed3fc89d29eb49211d8c # HEAD as of 30.09.2019 +sahara_dashboard_git_install_branch: 7ab456bff11e14ffdbbcd0c65998e4e135f6fa86 # HEAD as of 17.10.2019 sahara_dashboard_git_project_group: horizon_all -sahara_dashboard_git_track_branch: master +sahara_dashboard_git_track_branch: stable/train ## Keystone service keystone_git_repo: https://opendev.org/openstack/keystone -keystone_git_install_branch: e860c69831289a800a1d7bb52e8621fc460f260b # HEAD as of 30.09.2019 +keystone_git_install_branch: 0f6c6061b3026dc7a33bffad20848ebd3341af4b # HEAD as of 17.10.2019 keystone_git_project_group: keystone_all -keystone_git_track_branch: master +keystone_git_track_branch: stable/train ## Manila service manila_git_repo: https://opendev.org/openstack/manila -manila_git_install_branch: 2cfc0b0f0cf12a931a6d25f9821d51f077ac205f # HEAD as of 30.09.2019 +manila_git_install_branch: ad60658a7ca93619afe9a7683ecf8c84bf7f2e4b # HEAD as of 17.10.2019 manila_git_project_group: manila_all -manila_git_track_branch: master +manila_git_track_branch: stable/train ## Neutron service neutron_git_repo: https://opendev.org/openstack/neutron -neutron_git_install_branch: 8a584171cd505593c69f9149aa58c6aa9b9e7ac3 # HEAD as of 30.09.2019 +neutron_git_install_branch: 54c8943ab5a6b980212d9c4c94173dc6b41dc78d # HEAD as of 17.10.2019 neutron_git_project_group: neutron_all -neutron_git_track_branch: master +neutron_git_track_branch: stable/train neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: 06605a2282762ce3d964fd2f0ade9c1a4e79c745 # HEAD as of 30.09.2019 +neutron_vpnaas_git_install_branch: d16083786341308b9d8dbe173ae920bc1b9396c9 # HEAD as of 17.10.2019 neutron_vpnaas_git_project_group: neutron_all -neutron_vpnaas_git_track_branch: master +neutron_vpnaas_git_track_branch: stable/train neutron_fwaas_git_repo: https://opendev.org/openstack/neutron-fwaas -neutron_fwaas_git_install_branch: 201a2abebe37f85f58d44591c02a763b2223f008 # HEAD as of 30.09.2019 +neutron_fwaas_git_install_branch: 22d5255c2b9b65d0c553e2ae2fb3f9bb01a7c04c # HEAD as of 17.10.2019 neutron_fwaas_git_project_group: neutron_all -neutron_fwaas_git_track_branch: master +neutron_fwaas_git_track_branch: stable/train neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing -neutron_dynamic_routing_git_install_branch: b6d13bdce51a38408051120b1e05281b23e1dac9 # HEAD as of 30.09.2019 +neutron_dynamic_routing_git_install_branch: c2cf1cd0671d2f658499e2874c484710c61ad741 # HEAD as of 17.10.2019 neutron_dynamic_routing_git_project_group: neutron_all -neutron_dynamic_routing_git_track_branch: master +neutron_dynamic_routing_git_track_branch: stable/train # Networking calico follows master networking_calico_git_repo: https://opendev.org/openstack/networking-calico -networking_calico_git_install_branch: 79bdf4995d102833d23479180350216fc59e4b94 # HEAD as of 30.09.2019 +networking_calico_git_install_branch: 79bdf4995d102833d23479180350216fc59e4b94 # HEAD as of 17.10.2019 networking_calico_git_project_group: neutron_all networking_calico_git_track_branch: master networking_odl_git_repo: https://opendev.org/openstack/networking-odl -networking_odl_git_install_branch: 9639f57a43765c9b5a20600ac339d7727df6e35d # HEAD as of 30.09.2019 +networking_odl_git_install_branch: 8efa1b38fe355887576782b756b9aec9f647a574 # HEAD as of 17.10.2019 networking_odl_git_project_group: neutron_all -networking_odl_git_track_branch: master +networking_odl_git_track_branch: stable/train networking_ovn_git_repo: https://opendev.org/openstack/networking-ovn -networking_ovn_git_install_branch: c19965ccc3a85738af4dc597cc6e6284c19d65c0 # HEAD as of 30.09.2019 +networking_ovn_git_install_branch: d5aef910156bf3ed3d36aeee151c0642aa7fde81 # HEAD as of 17.10.2019 networking_ovn_git_project_group: neutron_all -networking_ovn_git_track_branch: master +networking_ovn_git_track_branch: stable/train # BGPVPN is frozen until further notice due to # https://github.com/openstack/networking-bgpvpn/commit/e9a0ea199b47f76f69545e04bdb4db44869c388b#diff-b4ef698db8ca845e5845c4618278f29a @@ -193,126 +193,126 @@ networking_bgpvpn_git_project_group: neutron_all networking_bgpvpn_git_track_branch: None networking_sfc_git_repo: https://opendev.org/openstack/networking-sfc -networking_sfc_git_install_branch: 0644862c8beedd902a7d739be524699edc9b61d3 # HEAD as of 30.09.2019 +networking_sfc_git_install_branch: 699eafdf8352bcf07852af7f57b4b5c2f83e508a # HEAD as of 17.10.2019 networking_sfc_git_project_group: neutron_all -networking_sfc_git_track_branch: master +networking_sfc_git_track_branch: stable/train ## Nova service nova_git_repo: https://opendev.org/openstack/nova -nova_git_install_branch: 961c2945491ebcea3cf1cb175a06d057155aa5a5 # HEAD as of 30.09.2019 +nova_git_install_branch: 875826df959bf953609aa66d793793afa5ad618a # HEAD as of 17.10.2019 nova_git_project_group: nova_all -nova_git_track_branch: master +nova_git_track_branch: stable/train ## Sahara service sahara_git_repo: https://opendev.org/openstack/sahara -sahara_git_install_branch: 91418b8185f4d78bba4a6b80f64749f57ecebcd9 # HEAD as of 30.09.2019 +sahara_git_install_branch: 8501b5235cb4c4d23eba796f201eace350e08bf2 # HEAD as of 17.10.2019 sahara_git_project_group: sahara_all -sahara_git_track_branch: master +sahara_git_track_branch: stable/train ## Swift service swift_git_repo: https://opendev.org/openstack/swift -swift_git_install_branch: 2f7b4440d44aab8de4fe4d2b2c158f4ce688836e # HEAD as of 30.09.2019 +swift_git_install_branch: fe5433da3c152c9463e66efe389b0393b43061c6 # HEAD as of 17.10.2019 swift_git_project_group: swift_all -swift_git_track_branch: master +swift_git_track_branch: stable/train ## Ironic service ironic_git_repo: https://opendev.org/openstack/ironic -ironic_git_install_branch: 0d1a929f9e94fc453ce81bec5b2804d4cfb557d0 # HEAD as of 30.09.2019 +ironic_git_install_branch: 178d4e6fb791a9e36652908f285fd8984536eabe # HEAD as of 17.10.2019 ironic_git_project_group: ironic_all -ironic_git_track_branch: master +ironic_git_track_branch: stable/train ## Magnum service magnum_git_repo: https://opendev.org/openstack/magnum -magnum_git_install_branch: e52f77b299c50f004ee5a875c68d7f129b88a2af # HEAD as of 30.09.2019 +magnum_git_install_branch: b449ed8964ce06cc89ba26c26da63f10ee57a98a # HEAD as of 17.10.2019 magnum_git_project_group: magnum_all -magnum_git_track_branch: master +magnum_git_track_branch: stable/train ## Masakari service masakari_git_repo: https://opendev.org/openstack/masakari -masakari_git_install_branch: 3a6f76b56212033e60b5b25913aca5d70eb7e2cc # HEAD as of 30.09.2019 +masakari_git_install_branch: 81488bac200d7c3cc6c535b1079bce5de565424b # HEAD as of 17.10.2019 masakari_git_project_group: masakari_api -masakari_git_track_branch: master +masakari_git_track_branch: stable/train ## Masakari monitors services masakari_monitors_git_repo: https://opendev.org/openstack/masakari-monitors -masakari_monitors_git_install_branch: f13f2ed585845f2c0e3d589e23c48b8f12d239ea # HEAD as of 30.09.2019 +masakari_monitors_git_install_branch: b02c6b6931c0256f4ce6d7167c97ebb849ff3453 # HEAD as of 17.10.2019 masakari_monitors_git_project_group: masakari_monitor -masakari_monitors_git_track_branch: master +masakari_monitors_git_track_branch: stable/train ## Mistral service mistral_git_repo: https://opendev.org/openstack/mistral -mistral_git_install_branch: e4f62dab1d6160f2a41cd05b0ec893d7dcc55989 # HEAD as of 30.09.2019 +mistral_git_install_branch: 5d387db6c2a53e3c28d46ffd7da45cf1f52a3d8b # HEAD as of 17.10.2019 mistral_git_project_group: mistral_all -mistral_git_track_branch: master +mistral_git_track_branch: stable/train ## Trove service trove_git_repo: https://opendev.org/openstack/trove -trove_git_install_branch: cdac6278aff0ad564a881d16368bbdf9be732b99 # HEAD as of 30.09.2019 +trove_git_install_branch: 09e3a53737e4b97ce1d617315419d690bbc1e8d8 # HEAD as of 17.10.2019 trove_git_project_group: trove_all -trove_git_track_branch: master +trove_git_track_branch: stable/train ## Horizon Trove dashboard plugin trove_dashboard_git_repo: https://opendev.org/openstack/trove-dashboard -trove_dashboard_git_install_branch: 1879195d64b877e167534ba4371dfda6d4ed1672 # HEAD as of 30.09.2019 +trove_dashboard_git_install_branch: 5035eaed0e5dba7abcc6cf36db529c4556fa7409 # HEAD as of 17.10.2019 trove_dashboard_git_project_group: horizon_all -trove_dashboard_git_track_branch: master +trove_dashboard_git_track_branch: stable/train ## Octavia service octavia_git_repo: https://opendev.org/openstack/octavia -octavia_git_install_branch: d7f0c819e376297989773c35f417fb3e0f2cd1e8 # HEAD as of 30.09.2019 +octavia_git_install_branch: 6f54167b05cab1ef2721d63ddee99f92d61ea14f # HEAD as of 17.10.2019 octavia_git_project_group: octavia_all -octavia_git_track_branch: master +octavia_git_track_branch: stable/train ## Panko service panko_git_repo: https://opendev.org/openstack/panko -panko_git_install_branch: 59245276791dcc275aec10aa002ccd645d1afd69 # HEAD as of 30.09.2019 +panko_git_install_branch: 9b551e7a4501a5d5109adc55cc9cf8c314444d0c # HEAD as of 17.10.2019 panko_git_project_group: panko_all -panko_git_track_branch: master +panko_git_track_branch: stable/train ## Placement service placement_git_repo: https://opendev.org/openstack/placement -placement_git_install_branch: c6fb9c30cc02d5e27cfc87ed986a190a92d7e213 # HEAD as of 30.09.2019 +placement_git_install_branch: 36beddbaf5e3cc4dce8e3abda5471fe95704feae # HEAD as of 17.10.2019 placement_git_project_group: placement_all -placement_git_track_branch: master +placement_git_track_branch: stable/train ## Tacker service tacker_git_repo: https://opendev.org/openstack/tacker -tacker_git_install_branch: e4c7805f9b38533b42e23bc2f1e6d9c2d2e38944 # HEAD as of 30.09.2019 +tacker_git_install_branch: 36c965004873459973419dab15d6744047340291 # HEAD as of 17.10.2019 tacker_git_project_group: tacker_all -tacker_git_track_branch: master +tacker_git_track_branch: stable/train ## Congress service congress_git_repo: https://opendev.org/openstack/congress -congress_git_install_branch: 8d0a830165a031efcedba37f30ca214035e5d860 # HEAD as of 30.09.2019 +congress_git_install_branch: 6c524a752706c60cc97418f71e22bd9de2f6cb70 # HEAD as of 17.10.2019 congress_git_package_name: openstack-congress congress_git_project_group: congress_all -congress_git_track_branch: master +congress_git_track_branch: stable/train ## Horizon Octavia dashboard plugin octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard -octavia_dashboard_git_install_branch: 4ccd1a0b1c93293a2e4dd974fc35d85255cdd0f2 # HEAD as of 30.09.2019 +octavia_dashboard_git_install_branch: d515a7450bf229222358045a57301c2778f18344 # HEAD as of 17.10.2019 octavia_dashboard_git_project_group: horizon_all -octavia_dashboard_git_track_branch: master +octavia_dashboard_git_track_branch: stable/train ## Blazar service blazar_git_repo: https://opendev.org/openstack/blazar -blazar_git_install_branch: a2bcedbb9c923868f0f15f70a2395cbfacba5a74 # HEAD as of 30.09.2019 +blazar_git_install_branch: 835001a26dd4fb8634528d0a15eb1b42d2d0ce7a # HEAD as of 17.10.2019 blazar_git_project_group: blazar_all -blazar_git_track_branch: master +blazar_git_track_branch: stable/train ## Blazar Nova Service blazar_nova_git_repo: https://opendev.org/openstack/blazar-nova -blazar_nova_git_install_branch: 32350eb304768a59ce597f498eff92783cb575ac # HEAD as of 30.09.2019 +blazar_nova_git_install_branch: 48579dd44794810f8f3eafe18de6b73569483086 # HEAD as of 17.10.2019 blazar_nova_git_project_group: blazar_all -blazar_nova_git_track_branch: master +blazar_nova_git_track_branch: stable/train diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml deleted file mode 100644 index 4bc2a31b06..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: de20df69549d9aa8fc13554dc196deac60f2e34b # HEAD as of 30.09.2019 -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 fa88e7ca1d..9a1f0e7be0 100644 --- a/playbooks/os-tempest-install.yml +++ b/playbooks/os-tempest-install.yml @@ -18,7 +18,6 @@ gather_facts: "{{ osa_gather_facts | default(True) }}" user: root vars_files: - - "defaults/repo_packages/openstack_testing.yml" - "defaults/{{ install_method }}_install.yml" pre_tasks: - name: End playbook diff --git a/releasenotes/notes/app-credentials-709e7ae0573b4955.yaml b/releasenotes/notes/app-credentials-709e7ae0573b4955.yaml new file mode 100644 index 0000000000..3e1b8a1d4e --- /dev/null +++ b/releasenotes/notes/app-credentials-709e7ae0573b4955.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + Application credentials are now enabled by default as a keystone + authentication method. If deployments do not wish to enable + application credentials then the existing keystone_auth_methods variable + can be overidden with the required set of authentication methods. diff --git a/releasenotes/notes/centos-private-epel-3fe4c9ff68ec3a18.yaml b/releasenotes/notes/centos-private-epel-3fe4c9ff68ec3a18.yaml new file mode 100644 index 0000000000..56df38dc2e --- /dev/null +++ b/releasenotes/notes/centos-private-epel-3fe4c9ff68ec3a18.yaml @@ -0,0 +1,6 @@ +--- +features: + - You can set a private repository for epel, you must use + ``repo_centos_epel_mirror`` for the repo URL and if you need to get the GPG + key from intranet or a mirror use ``repo_centos_epel_key`` for gpg key + location. diff --git a/releasenotes/notes/horizon_haproxy_conflict-27955d6b7c1a6d30.yaml b/releasenotes/notes/horizon_haproxy_conflict-27955d6b7c1a6d30.yaml new file mode 100644 index 0000000000..3c6b003fdd --- /dev/null +++ b/releasenotes/notes/horizon_haproxy_conflict-27955d6b7c1a6d30.yaml @@ -0,0 +1,10 @@ +--- +upgrade: + - | + `horizon_listen_ports` variable was transformed to the dictionary with + required keys `http` and `https` to have effect not only for apache + ports.conf file, but also for the virtual host. +features: + - | + Added variable `horizon_bind_address` which defines IP address where Apache + will listen on `horizon_listen_ports` \ No newline at end of file