Skip to content

Merge upstream kayobe-config stable/2024.1 #1300

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

Merged
merged 9 commits into from
Sep 24, 2024
Merged

Merge upstream kayobe-config stable/2024.1 #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3adf46c
2023.1 - Sync defaults with Kayobe
markgoddard Jun 1, 2023
651b8be
kayobe-env: Unstick KOLLA_SOURCE_PATH and KOLLA_VENV_PATH
markgoddard Sep 20, 2023
04a6f86
[release] Synchronise with kayobe for 2023.2
priteau Dec 1, 2023
23253cf
[release] Synchronise with kayobe for 2024.1
priteau May 30, 2024
9fb58db
Sync with kayobe for 2024.1 release
jovial Jun 5, 2024
205d070
Update .gitreview for stable/2024.1
openstackadmin Jun 7, 2024
982bfae
Update TOX_CONSTRAINTS_FILE for stable/2024.1
openstackadmin Jun 7, 2024
56d21e1
[2024.1-only] Synchronise with latest kayobe
priteau Sep 16, 2024
90354f6
Merge branch 'stable/2024.1' into stackhpc/2024.1
priteau Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions etc/kayobe/apt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ stackhpc_apt_auth:
# * machine: 'machine' entry in the auth file
# * login: 'login' entry in the auth file
# * password: 'password' entry in the auth file
# * filename: Name of a file in which to store the auth configuration. The
# extension should be '.conf'.
# * filename: Name of a file in /etc/apt/auth.conf.d in which to store
# the auth configuration. The extension should be ``.conf``.
# Default is an empty list.
apt_auth: "{{ stackhpc_apt_auth if stackhpc_repos_enabled | bool and stackhpc_repo_mirror_username is truthy else [] }}"

Expand Down
16 changes: 12 additions & 4 deletions etc/kayobe/infra-vms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@

# Base image for the infra VM root volume. Default is
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu", or
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky",
# or
# when os_distribution is "ubuntu",
# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
# when os_distribution is "rocky" and seed_vm_boot_firmware is "efi",
# "https://dl.rockylinux.org/vault/rocky/9.3/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
# when os_distribution is "rocky" and seed_vm_boot_firmware is not "efi"
# (default is "bios"), or
# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
# otherwise.
#infra_vm_root_image:
Expand All @@ -58,6 +60,12 @@
# OS family. Needed for config drive generation.
#infra_vm_os_family:

# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'bios'.
#infra_vm_boot_firmware:

# Machine type. Libvirt default configuration is used.
#infra_vm_machine:

###############################################################################
# Infrastructure VM node configuration.

Expand Down
1 change: 0 additions & 1 deletion etc/kayobe/kolla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,6 @@ kolla_enable_mariabackup: True
#kolla_enable_openstack_core:
#kolla_enable_openvswitch:
#kolla_enable_osprofiler:
#kolla_enable_outward_rabbitmq:
kolla_enable_ovn: true
#kolla_enable_ovs_dpdk:
#kolla_enable_placement:
Expand Down
14 changes: 11 additions & 3 deletions etc/kayobe/seed-vm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@
# Base image for the seed VM root volume. Default is
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu",
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky",
# or
# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
# when os_distribution is "rocky" and seed_vm_boot_firmware is "efi",
# "https://dl.rockylinux.org/vault/rocky/9.3/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
# when os_distribution is "rocky" and seed_vm_boot_firmware is not "efi"
# (default is "bios"), or
# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
# otherwise.
#seed_vm_root_image:
Expand All @@ -61,6 +63,12 @@
#
#seed_vm_interfaces:

# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'bios'.
#seed_vm_boot_firmware:

# Machine type. Libvirt default configuration is used.
#seed_vm_machine:

###############################################################################
# Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes
Loading