diff --git a/etc/kayobe/apt.yml b/etc/kayobe/apt.yml index 5361c84c3..08db21910 100644 --- a/etc/kayobe/apt.yml +++ b/etc/kayobe/apt.yml @@ -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 [] }}" diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml index f6a1a6fe6..2c4a98fe0 100644 --- a/etc/kayobe/infra-vms.yml +++ b/etc/kayobe/infra-vms.yml @@ -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: @@ -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. diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 25d131786..4b08894e7 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -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: diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml index f10fbaa19..42aea8da5 100644 --- a/etc/kayobe/seed-vm.yml +++ b/etc/kayobe/seed-vm.yml @@ -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: @@ -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