Skip to content

Commit d422259

Browse files
committed
Synchronise with kayobe stable/yoga
Synchronise with kayobe @ 32b12be953d0c2f60970a95b82d0ebf846d0f86f. Change-Id: Ib4b75c084820f16ce245c1e1c50f10ccb2083537
1 parent ded3c04 commit d422259

File tree

11 files changed

+63
-39
lines changed

11 files changed

+63
-39
lines changed

etc/kayobe/bifrost.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@
116116
# Ironic inspector deployment ramdisk location.
117117
#kolla_bifrost_inspector_deploy_ramdisk:
118118

119+
# Ironic inspector legacy deployment kernel location.
120+
#kolla_bifrost_inspector_legacy_deploy_kernel:
121+
119122
# Timeout of hardware inspection on overcloud nodes, in seconds. Default is
120123
# {{ inspector_inspection_timeout }}.
121124
#kolla_bifrost_inspection_timeout:

etc/kayobe/compute.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@
6363
###############################################################################
6464
# Compute node LVM configuration.
6565

66-
# List of compute volume groups. See mrlesmithjr.manage-lvm role for
66+
# List of compute volume groups. See mrlesmithjr.manage_lvm role for
6767
# format.
6868
#compute_lvm_groups:
6969

70-
# Default list of compute volume groups. See mrlesmithjr.manage-lvm role for
70+
# Default list of compute volume groups. See mrlesmithjr.manage_lvm role for
7171
# format.
7272
#compute_lvm_groups_default:
7373

74-
# Additional list of compute volume groups. See mrlesmithjr.manage-lvm role
74+
# Additional list of compute volume groups. See mrlesmithjr.manage_lvm role
7575
# for format.
7676
#compute_lvm_groups_extra:
7777

@@ -82,7 +82,7 @@
8282
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
8383
#compute_lvm_group_data_enabled:
8484

85-
# Compute LVM volume group for data. See mrlesmithjr.manage-lvm role for
85+
# Compute LVM volume group for data. See mrlesmithjr.manage_lvm role for
8686
# format.
8787
#compute_lvm_group_data:
8888

etc/kayobe/controllers.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@
7272
###############################################################################
7373
# Controller node LVM configuration.
7474

75-
# List of controller volume groups. See mrlesmithjr.manage-lvm role for
75+
# List of controller volume groups. See mrlesmithjr.manage_lvm role for
7676
# format.
7777
#controller_lvm_groups:
7878

79-
# Default list of controller volume groups. See mrlesmithjr.manage-lvm role for
79+
# Default list of controller volume groups. See mrlesmithjr.manage_lvm role for
8080
# format.
8181
#controller_lvm_groups_default:
8282

83-
# Additional list of controller volume groups. See mrlesmithjr.manage-lvm role
83+
# Additional list of controller volume groups. See mrlesmithjr.manage_lvm role
8484
# for format.
8585
#controller_lvm_groups_extra:
8686

@@ -91,7 +91,7 @@
9191
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
9292
#controller_lvm_group_data_enabled:
9393

94-
# Controller LVM volume group for data. See mrlesmithjr.manage-lvm role for
94+
# Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for
9595
# format.
9696
#controller_lvm_group_data:
9797

etc/kayobe/globals.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
###############################################################################
55
# Local path configuration (Ansible control host).
66

7-
# Path to Kayobe configuration directory on Ansible control host, with an
8-
# environment path appended if kayobe_environment is set.
7+
# Path to Kayobe configuration directory on Ansible control host.
98
#kayobe_config_path:
109

1110
# Name of Kayobe environment to use. Default is $KAYOBE_ENVIRONMENT, or an
@@ -50,7 +49,7 @@
5049
#os_distribution:
5150

5251
# OS release. Valid options are "8-stream" when os_distribution is "centos", or
53-
# "8" when os_distribution is "rocky", or "focal" and "jammy" when
52+
# "8" or "9" when os_distribution is "rocky", or "focal" and "jammy" when
5453
# os_distribution is "ubuntu".
5554
#os_release:
5655

etc/kayobe/infra-vms.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@
3232
# Base image for the infra VM root volume. Default is
3333
# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
3434
# when os_distribution is "ubuntu", or
35-
# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
36-
# when os_distribution is "rocky",
35+
# https://dl.rockylinux.org/pub/rocky/8/images/x86_64/Rocky-8-GenericCloud.latest.x86_64.qcow2
36+
# when os_distribution is "rocky" and os_release is "8"
3737
# or
38-
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2"
38+
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
39+
# when os_distribution is "rocky" and os_release is "9"
40+
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-latest.x86_64.qcow2"
3941
# otherwise.
4042
#infra_vm_root_image:
4143

@@ -92,15 +94,15 @@
9294
###############################################################################
9395
# Infrastructure VM node LVM configuration.
9496

95-
# List of infrastructure vm volume groups. See mrlesmithjr.manage-lvm role for
97+
# List of infrastructure vm volume groups. See mrlesmithjr.manage_lvm role for
9698
# format.
9799
#infra_vm_lvm_groups:
98100

99-
# Default list of infrastructure vm volume groups. See mrlesmithjr.manage-lvm
101+
# Default list of infrastructure vm volume groups. See mrlesmithjr.manage_lvm
100102
# role for format.
101103
#infra_vm_lvm_groups_default:
102104

103-
# Additional list of infrastructure vm volume groups. See mrlesmithjr.manage-lvm
105+
# Additional list of infrastructure vm volume groups. See mrlesmithjr.manage_lvm
104106
# role for format.
105107
#infra_vm_lvm_groups_extra:
106108

@@ -111,7 +113,7 @@
111113
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
112114
#infra_vm_lvm_group_data_enabled:
113115

114-
# Infrastructure VM LVM volume group for data. See mrlesmithjr.manage-lvm role
116+
# Infrastructure VM LVM volume group for data. See mrlesmithjr.manage_lvm role
115117
# for format.
116118
#infra_vm_lvm_group_data:
117119

etc/kayobe/kolla.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@
6767
# Kolla configuration.
6868

6969
# Kolla base container image distribution. Options are "centos", "debian",
70-
# "ubuntu". Default is
71-
# {{ 'centos' if os_distribution == 'rocky' else os_distribution }}.
70+
# "rocky", "ubuntu". Default is
71+
# {{ 'centos' if (os_distribution == 'rocky' and os_release == '8') else
72+
# os_distribution }}.
7273
#kolla_base_distro:
7374

7475
# Kolla container image type: binary or source. Default is 'source'.
@@ -298,6 +299,7 @@
298299
#kolla_enable_gnocchi:
299300
#kolla_enable_gnocchi_statsd:
300301
#kolla_enable_grafana:
302+
#kolla_enable_grafana_external:
301303
#kolla_enable_hacluster:
302304
#kolla_enable_haproxy:
303305
#kolla_enable_haproxy_memcached:
@@ -337,6 +339,7 @@
337339
#kolla_enable_keystone_federation:
338340
#kolla_enable_keystone_horizon_policy_file:
339341
#kolla_enable_kibana:
342+
#kolla_enable_kibana_external:
340343
#kolla_enable_kuryr:
341344
#kolla_enable_loadbalancer:
342345
#kolla_enable_magnum:
@@ -349,6 +352,8 @@
349352
#kolla_enable_mariabackup:
350353
#kolla_enable_mariadb:
351354
#kolla_enable_masakari:
355+
#kolla_enable_masakari_hostmonitor:
356+
#kolla_enable_masakari_instancemonitor:
352357
#kolla_enable_memcached:
353358
#kolla_enable_mistral:
354359
#kolla_enable_monasca:
@@ -379,6 +384,9 @@
379384
#kolla_enable_nova_ssh:
380385
#kolla_enable_octavia:
381386
#kolla_enable_octavia_driver_agent:
387+
#kolla_enable_opensearch:
388+
#kolla_enable_opensearch_dashboards:
389+
#kolla_enable_opensearch_dashboards_external:
382390
#kolla_enable_openstack_core:
383391
#kolla_enable_openvswitch:
384392
#kolla_enable_osprofiler:
@@ -388,6 +396,7 @@
388396
#kolla_enable_placement:
389397
#kolla_enable_prometheus:
390398
#kolla_enable_prometheus_alertmanager:
399+
#kolla_enable_prometheus_alertmanager_external:
391400
#kolla_enable_prometheus_blackbox_exporter:
392401
#kolla_enable_prometheus_cadvisor:
393402
#kolla_enable_prometheus_ceph_mgr_exporter:
@@ -397,6 +406,7 @@
397406
#kolla_enable_prometheus_haproxy_exporter:
398407
#kolla_enable_prometheus_libvirt_exporter:
399408
#kolla_enable_prometheus_memcached_exporter:
409+
#kolla_enable_prometheus_msteams:
400410
#kolla_enable_prometheus_mysqld_exporter:
401411
#kolla_enable_prometheus_node_exporter:
402412
#kolla_enable_prometheus_openstack_exporter:
@@ -430,6 +440,10 @@
430440
# Kolla passwords file.
431441
#kolla_ansible_default_custom_passwords:
432442

443+
# Dictionary containing extra custom passwords to add or override in the Kolla
444+
# passwords file.
445+
#kolla_ansible_extra_custom_passwords:
446+
433447
# Dictionary containing custom passwords to add or override in the Kolla
434448
# passwords file.
435449
#kolla_ansible_custom_passwords:
@@ -469,7 +483,7 @@
469483
# Path to a CA certificate file to use for the OS_CACERT environment variable
470484
# in public-openrc.sh file when TLS is enabled, instead of Kolla-Ansible's
471485
# default.
472-
#kolla_external_fqdn_cacert:
486+
#kolla_public_openrc_cacert:
473487

474488
# Internal API certificate bundle.
475489
#
@@ -482,7 +496,7 @@
482496
# Path to a CA certificate file to use for the OS_CACERT environment variable
483497
# in admin-openrc.sh file when TLS is enabled, instead of Kolla-Ansible's
484498
# default.
485-
#kolla_internal_fqdn_cacert:
499+
#kolla_admin_openrc_cacert:
486500

487501
###############################################################################
488502
# Proxy configuration

etc/kayobe/monitoring.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@
6363
###############################################################################
6464
# Monitoring node LVM configuration.
6565

66-
# List of monitoring node volume groups. See mrlesmithjr.manage-lvm role for
66+
# List of monitoring node volume groups. See mrlesmithjr.manage_lvm role for
6767
# format.
6868
#monitoring_lvm_groups:
6969

70-
# Default list of monitoring node volume groups. See mrlesmithjr.manage-lvm
70+
# Default list of monitoring node volume groups. See mrlesmithjr.manage_lvm
7171
# role for format.
7272
#monitoring_lvm_groups_default:
7373

74-
# Additional list of monitoring node volume groups. See mrlesmithjr.manage-lvm
74+
# Additional list of monitoring node volume groups. See mrlesmithjr.manage_lvm
7575
# role for format.
7676
#monitoring_lvm_groups_extra:
7777

etc/kayobe/seed-hypervisor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
###############################################################################
3737
# Seed hypervisor node LVM configuration.
3838

39-
# List of seed hypervisor volume groups. See mrlesmithjr.manage-lvm role for
39+
# List of seed hypervisor volume groups. See mrlesmithjr.manage_lvm role for
4040
# format. Set to "{{ seed_hypervisor_lvm_groups_with_data }}" to create a
4141
# volume group for libvirt storage.
4242
#seed_hypervisor_lvm_groups:
@@ -45,7 +45,7 @@
4545
# default.
4646
#seed_hypervisor_lvm_groups_with_data:
4747

48-
# Seed LVM volume group for data. See mrlesmithjr.manage-lvm role for format.
48+
# Seed LVM volume group for data. See mrlesmithjr.manage_lvm role for format.
4949
#seed_hypervisor_lvm_group_data:
5050

5151
# List of disks for use by seed hypervisor LVM data volume group. Default to an

etc/kayobe/seed-vm.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@
2525

2626
# Base image for the seed VM root volume. Default is
2727
# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
28-
# when os_distribution is "ubuntu",
29-
# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
30-
# when os_distribution is "rocky",
28+
# when os_distribution is "ubuntu", or
29+
# https://dl.rockylinux.org/pub/rocky/8/images/x86_64/Rocky-8-GenericCloud.latest.x86_64.qcow2
30+
# when os_distribution is "rocky" and os_release is "8"
3131
# or
32-
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2"
32+
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
33+
# when os_distribution is "rocky" and os_release is "9"
34+
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-latest.x86_64.qcow2"
3335
# otherwise.
3436
#seed_vm_root_image:
3537

etc/kayobe/seed.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
###############################################################################
3737
# Seed node LVM configuration.
3838

39-
# List of seed volume groups. See mrlesmithjr.manage-lvm role for format.
39+
# List of seed volume groups. See mrlesmithjr.manage_lvm role for format.
4040
#seed_lvm_groups:
4141

42-
# Default list of seed volume groups. See mrlesmithjr.manage-lvm role for
42+
# Default list of seed volume groups. See mrlesmithjr.manage_lvm role for
4343
# format.
4444
#seed_lvm_groups_default:
4545

46-
# Additional list of seed volume groups. See mrlesmithjr.manage-lvm role for
46+
# Additional list of seed volume groups. See mrlesmithjr.manage_lvm role for
4747
# format.
4848
#seed_lvm_groups_extra:
4949

@@ -54,7 +54,7 @@
5454
# 'docker_storage_driver' is set to 'devicemapper', or false otherwise.
5555
#seed_lvm_group_data_enabled:
5656

57-
# Seed LVM volume group for data. See mrlesmithjr.manage-lvm role for format.
57+
# Seed LVM volume group for data. See mrlesmithjr.manage_lvm role for format.
5858
#seed_lvm_group_data:
5959

6060
# List of disks for use by seed LVM data volume group. Default to an invalid
@@ -106,6 +106,10 @@
106106
#
107107
#seed_containers:
108108

109+
# Whether to attempt a basic authentication login to a registry when
110+
# deploying seed containers
111+
#seed_deploy_containers_registry_attempt_login:
112+
109113
###############################################################################
110114
# Seed node firewalld configuration.
111115

0 commit comments

Comments
 (0)