Skip to content

Commit 9b8b3e2

Browse files
markgoddardmarkgoddard
authored
Merge pull request #597 from stackhpc/zed-sync-upstream
Zed sync upstream
2 parents 9794911 + 9b09f6f commit 9b8b3e2

24 files changed

+170
-314
lines changed

‎.gitreview

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
host=review.opendev.org
33
port=29418
44
project=openstack/kayobe-config.git
5-
defaultbranch=stable/yoga
5+
defaultbranch=stable/zed

‎etc/kayobe/apt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ apt_keys:
3838
# * types: whitespace-separated list of repository types, e.g. deb or deb-src
3939
# (optional, default is 'deb')
4040
# * url: URL of the repository
41-
# * suites: whitespace-separated list of suites, e.g. focal (optional, default
41+
# * suites: whitespace-separated list of suites, e.g. jammy (optional, default
4242
# is ansible_facts.distribution_release)
4343
# * components: whitespace-separated list of components, e.g. main (optional,
4444
# default is 'main')

‎etc/kayobe/compute.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
#compute_qemu_conf:
181181

182182
# Whether to enable libvirt SASL authentication. Default is true.
183-
#compute_libvirt_enable_sasl:
183+
#compute_libvirt_enable_sasl: true
184184

185185
# libvirt SASL password. Default is unset.
186186
#compute_libvirt_sasl_password:

‎etc/kayobe/globals.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
# OS distribution.
4747

4848
# OS distribution name. Valid options are "centos", "rocky", "ubuntu". Default
49-
# is "centos".
49+
# is "rocky".
5050
#os_distribution:
5151

52-
# 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
54-
# os_distribution is "ubuntu".
52+
# OS release. Valid options are "9-stream" when os_distribution is "centos", or
53+
# "9" when os_distribution is "rocky", or "jammy" when os_distribution is
54+
# "ubuntu".
5555
#os_release:
5656

5757
###############################################################################

‎etc/kayobe/grafana.yml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,6 @@
66
# should not conflict with an OpenStack user name.
77
#grafana_local_admin_user_name:
88

9-
# Path to git repo containing Grafana dashboards. Eg.
10-
# https://github.com/stackhpc/grafana-reference-dashboards.git
11-
#grafana_monitoring_node_dashboard_repo:
12-
13-
# Dashboard repo version. Optional, defaults to 'HEAD'.
14-
#grafana_monitoring_node_dashboard_repo_version:
15-
16-
# Path to which Grafana dashboards will be cloned to a monitoring node
17-
#grafana_monitoring_node_dashboard_repo_checkout_path:
18-
19-
# The path, relative to the grafana_monitoring_node_dashboard_repo_checkout_path
20-
# containing the dashboards. Eg. /prometheus/control_plane
21-
#grafana_monitoring_node_dashboard_repo_path:
22-
23-
# The Grafana organisation for the control plane. Note that for Monasca
24-
# Grafana with domain support the format is:
25-
# organisation_name@openstack_domain
26-
#grafana_control_plane_organisation:
27-
28-
# A dict of datasources to configure. See the stackhpc.grafana-conf role
29-
# for all supported datasources. Example:
30-
#
31-
# grafana_datasources:
32-
# monasca_api:
33-
# port: 8082
34-
# host: monasca-api
35-
# monasca_log_api:
36-
# port: 5607
37-
# host: monasca-log-api
38-
# elasticsearch:
39-
# port: 9200
40-
# host: monasca-elasticsearch
41-
# project_id: "some_id"
42-
#
43-
#grafana_datasources:
44-
459
###############################################################################
4610
# Dummy variable to allow Ansible to accept this file.
4711
workaround_ansible_issue_8743: yes

‎etc/kayobe/infra-vms.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
#infra_vm_root_format:
3131

3232
# Base image for the infra VM root volume. Default is
33-
# "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
33+
# "https://cloud-images.ubuntu.com/jammy/current/jammy-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
35+
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
3636
# when os_distribution is "rocky",
3737
# or
38-
# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2"
38+
# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
3939
# otherwise.
4040
#infra_vm_root_image:
4141

‎etc/kayobe/inspector.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@
8484
# Ironic inspector rule to set deployment ramdisk.
8585
#inspector_rule_deploy_ramdisk:
8686

87-
# Ironic inspector rule to set local boot capability
88-
#inspector_rule_local_boot:
89-
9087
# Ironic inspector rule to initialise root device hints.
9188
#inspector_rule_root_hint_init:
9289

‎etc/kayobe/inventory/group_vars/compute/network-interfaces

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,18 @@
22
###############################################################################
33
# Network interface definitions for the compute group.
44

5-
# Overcloud provisioning network IP information.
6-
# provision_oc_net_interface:
7-
# provision_oc_net_bridge_ports:
8-
# provision_oc_net_bond_slaves:
9-
10-
# Internal network IP information.
11-
# internal_net_interface:
12-
# internal_net_bridge_ports:
13-
# internal_net_bond_slaves:
14-
15-
# External network IP information.
16-
# external_net_interface:
17-
# external_net_bridge_ports:
18-
# external_net_bond_slaves:
19-
20-
# Storage network IP information.
21-
# storage_net_interface:
22-
# storage_net_bridge_ports:
23-
# storage_net_bond_slaves:
5+
# NOTE: The content of this section is very deployment-specific, since it
6+
# depends on the names and types of networks in the deployment. It should
7+
# define the group-specific attributes of networks. The following example shows
8+
# a basic configuration for a network called "example":
9+
#
10+
# example_interface: eth0
11+
#
12+
# Global network attributes such as subnet CIDRs are typically configured in
13+
# etc/kayobe/networks.yml.
14+
#
15+
# Further information on the available network attributes is provided in the
16+
# network configuration reference in the Kayobe documentation.
2417

2518
###############################################################################
2619
# Dummy variable to allow Ansible to accept this file.

‎etc/kayobe/inventory/group_vars/controllers/network-interfaces

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,18 @@
22
###############################################################################
33
# Network interface definitions for the controller group.
44

5-
# Overcloud provisioning network IP information.
6-
# provision_oc_net_interface:
7-
# provision_oc_net_bridge_ports:
8-
# provision_oc_net_bond_slaves:
9-
10-
# Workload provisioning network IP information.
11-
# provision_wl_net_interface:
12-
# provision_wl_net_bridge_ports:
13-
# provision_wl_net_bond_slaves:
14-
15-
# Internal network IP information.
16-
# internal_net_interface:
17-
# internal_net_bridge_ports:
18-
# internal_net_bond_slaves:
19-
20-
# External network IP information.
21-
# external_net_interface:
22-
# external_net_bridge_ports:
23-
# external_net_bond_slaves:
24-
25-
# Storage network IP information.
26-
# storage_net_interface:
27-
# storage_net_bridge_ports:
28-
# storage_net_bond_slaves:
29-
30-
# Storage management network IP information.
31-
# swift_storage_net_interface:
32-
# swift_storage_net_bridge_ports:
33-
# swift_storage_net_bond_slaves:
5+
# NOTE: The content of this section is very deployment-specific, since it
6+
# depends on the names and types of networks in the deployment. It should
7+
# define the group-specific attributes of networks. The following example shows
8+
# a basic configuration for a network called "example":
9+
#
10+
# example_interface: eth0
11+
#
12+
# Global network attributes such as subnet CIDRs are typically configured in
13+
# etc/kayobe/networks.yml.
14+
#
15+
# Further information on the available network attributes is provided in the
16+
# network configuration reference in the Kayobe documentation.
3417

3518
###############################################################################
3619
# Dummy variable to allow Ansible to accept this file.

‎etc/kayobe/inventory/group_vars/infra-vms/network-interfaces

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@
22
###############################################################################
33
# Network interface definitions for the infra-vms group.
44

5-
# Overcloud provisioning network IP information.
6-
# provision_oc_net_interface:
7-
# provision_oc_net_bridge_ports:
8-
# provision_oc_net_bond_slaves:
5+
# NOTE: The content of this section is very deployment-specific, since it
6+
# depends on the names and types of networks in the deployment. It should
7+
# define the group-specific attributes of networks. The following example shows
8+
# a basic configuration for a network called "example":
9+
#
10+
# example_interface: eth0
11+
#
12+
# Global network attributes such as subnet CIDRs are typically configured in
13+
# etc/kayobe/networks.yml.
14+
#
15+
# Further information on the available network attributes is provided in the
16+
# network configuration reference in the Kayobe documentation.
917

1018
###############################################################################
1119
# Dummy variable to allow Ansible to accept this file.

0 commit comments

Comments
 (0)