Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply Xena backports from Wallaby #17

Merged
merged 13 commits into from
Jul 13, 2022
Merged

Apply Xena backports from Wallaby #17

merged 13 commits into from
Jul 13, 2022

Conversation

markgoddard
Copy link

@markgoddard markgoddard commented Jun 20, 2022 •
edited
Loading 

git cherry-pick -x c35f112a14  # Build overcloud host image directly with DIB
git cherry-pick -x 774d01c1ef  # Add dependencies for EFI and LVM based overcloud images
git cherry-pick -x 35e0d76a96  # Support for untemplated dirs in kolla config
git cherry-pick -x ad3f6f10a2  # Add overcloud_dib_upper_constraints_file variable
git cherry-pick -x c4b74f4801  # libvirt: deploy libvirt on the host
git cherry-pick -x f4493e41ff  # libvirt: support SASL authentication
git cherry-pick -x 1375517d2b  # Adds kolla_ansible_venv_ansible
git cherry-pick -x 1fbb5cb400  # Add support for dellos10 switch configuration
git cherry-pick -x e48960ecf2  # Add support for configuring proxy settings
git cherry-pick -x 04d97cda85  # Add support for root filesystem UUID customisation
git cherry-pick -x 5ede87656c  # proxy: add ansible issue 8743 workaround
git cherry-pick -x bd191e7011  # Fix no_proxy configuration

@markgoddard markgoddard self-assigned this Jun 20, 2022
priteau and others added 8 commits June 20, 2022 13:40
@priteau @markgoddard
Build overcloud host image directly with DIB
aa98c9c 
As a first step towards supporting multiple overcloud disk images, this
change introduces a new command to build a disk image directly with DIB:
`kayobe overcloud host image build`.

It also disables building a root disk image during Bifrost bootstrap if
overcloud_dib_build_host_images is set to true.

Change-Id: I93d242889e225b4e60254f6b9cc5eeb457294ac8
Story: 2002098
Task: 41693
(cherry picked from commit c35f112)
@cityofships @markgoddard
Add dependencies for EFI and LVM based overcloud images
a93fe43 
Change-Id: I2c2378ebd99ac02586518e80e4b86a9d765476e6
(cherry picked from commit 774d01c)
@darmach @markgoddard
Support for untemplated dirs in kolla config
c8e26fe 
Variable untemplated_dirs has been added to allow for
defining directories under kayobe/kolla/config which should be copied
instead of templated by kolla-openstack role.

This is needed to support custom themes for horizon -
change If9982c8e18be31772cb031ef72b7eebd4d768be5

Change-Id: I350f58c8a82f0f31608b34054e804c5c198d6806
(cherry picked from commit 35e0d76)
@priteau @markgoddard
Add overcloud_dib_upper_constraints_file variable
82a288f 
This variable allows to customise the upper constraints file used to
install packages inside the overcloud-host-image-dib virtual
environment. This can be used when we need a newer version of
diskimage-builder than the one available in upper constraints for the
current release.

Change-Id: I2f6c2f92903815973865ef0f5d6b867d5b995bd5
Story: 2002098
Task: 44101
(cherry picked from commit ad3f6f1)
@markgoddard
libvirt: deploy libvirt on the host
559716e 
In some cases it may be desirable to run libvirt daemon on the host. For
example, when mixing host and container OS distributions.

This change makes it possible to disable the nova_libvirt container, by
setting kolla_enable_nova_libvirt_container to false.

The stackhpc.libvirt-host role is used in order to install and configure
a libvirt daemon on compute hosts when
kolla_enable_nova_libvirt_container is false.

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/825357
Depends-On: https://review.opendev.org/c/openstack/kayobe-config-dev/+/829225
Depends-On: stackhpc/ansible-role-libvirt-host#51

Story: 2009858
Task: 44495

Change-Id: I73fef63fb886a9d543d2f4231fb009523495edb3
(cherry picked from commit c4b74f4)
@markgoddard
libvirt: support SASL authentication
6142e31 
Adds support for SASL authentication of libvirt TCP and TLS connections
when using a compute host libvirt daemon.

In line with the dependent Kolla Ansible patch, we enable SASL by
default, and use DIGEST-MD5 with TCP and SCRAM-SHA-256 with TLS.

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/833022
Depends-On: stackhpc/ansible-role-libvirt-host#52

Story: 2009858
Task: 44735

Change-Id: Id3972c24022aeb6421494c3cccdc8e7cbce802e6
(cherry picked from commit f4493e4)
@jovial @markgoddard
Adds kolla_ansible_venv_ansible
969bfef 
This adds a variable that allows you to modify the version of ansible
installed in the kolla-ansible virtualenv. This is useful if you want
to use a customised version of ansible.

Change-Id: I319dd51ed3221826f820fbc0ae3639b89e9c82ea
(cherry picked from commit 1375517)
@jovial @markgoddard
Add support for dellos10 switch configuration
d5fb949 
Change-Id: I2823016294e7df63f63be9ab26535b3962a71ebe
(cherry picked from commit 1fbb5cb)
@markgoddard markgoddard marked this pull request as ready for review June 20, 2022 12:40
priteau and others added 5 commits July 8, 2022 10:02
@priteau @markgoddard
Add support for configuring proxy settings
769ca36 
Change-Id: Ic5130a7512d4a26354bd292b0ab51ab4a9279f0a
(cherry picked from commit e48960e)
@cityofships @markgoddard
Add support for root filesystem UUID customisation
bec3422 
Depends-on: https://review.opendev.org/c/openstack/bifrost/+/819785
Change-Id: I37b9d18f0523c121357c5a37ec6fc458209f8e79
(cherry picked from commit 04d97cd)
@markgoddard
proxy: add ansible issue 8743 workaround
90f987f 
Change-Id: I6515d028914e8956eac23662c3714a908fda6ac4
(cherry picked from commit 5ede876)
@priteau @markgoddard
Fix no_proxy configuration
9e89264 
The no_proxy list should only contain domains, hostnames, IP addresses
and networks, but docker_registry is often in the form ip_address:port.

Use urlsplit to extract the hostname from the docker_registry variable
after prepending http:// to turn it into a valid URL.

Also add missing infra-vms to hosts in proxy.yml.

Change-Id: I6424fc405894514a63fb2b641637bbb9d5c070c0
(cherry picked from commit 71eb21a)
(cherry picked from commit bd191e7)
@markgoddard
Fix up unit tests for proxy backport
ae2e0ed 
Change-Id: I7ca7608d36910eb519340641d037dc6601ab5fb2
@markgoddard markgoddard merged commit dccc454 into stackhpc/xena Jul 13, 2022
@markgoddard markgoddard deleted the xena-backports branch July 13, 2022 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jovial jovial jovial approved these changes

Assignees

@markgoddard markgoddard

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@markgoddard @jovial @priteau @cityofships @darmach