Skip to content

Commit 5b2b98b

Browse files
authored
Merge pull request #888 from stackhpc/sync-zed
Sync yoga into zed
2 parents 85d0798 + ee362ae commit 5b2b98b

12 files changed

+54
-21
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,6 @@ etc/kayobe/environments/aufn-ceph/kolla/config/cinder/ceph.conf
5555
etc/kayobe/environments/aufn-ceph/kolla/config/cinder/ceph.client.glance.keyring
5656
etc/kayobe/environments/aufn-ceph/kolla/config/nova/ceph.conf
5757
etc/kayobe/environments/aufn-ceph/kolla/config/nova/ceph.client.glance.keyring
58+
59+
# Tempest logs
60+
tempest-artifacts

etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ kayobe seed vm provision
8787
kayobe seed host configure
8888

8989
# Deploy local pulp server as a container on the seed VM
90-
kayobe seed service deploy --tags seed-deploy-containers --kolla-tags none
90+
kayobe seed service deploy --tags seed-deploy-containers --kolla-tags none -e deploy_containers_registry_attempt_login=False
9191

9292
# Deploying the seed restarts networking interface, run configure-local-networking.sh again to re-add routes.
9393
$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/configure-local-networking.sh

etc/kayobe/environments/aufn-ceph/networks.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,19 @@ cleaning_net_name: provision_wl
5555
# Network definitions.
5656

5757
mgmt_cidr: 192.168.35.0/24
58-
mgmt_mtu: 1450
58+
mgmt_mtu: 1442
5959
# Native VLAN
6060
mgmt_physical_network: mgmt
6161

6262
provision_oc_cidr: 192.168.33.0/24
63-
provision_oc_mtu: 1450
63+
provision_oc_mtu: 1442
6464
provision_oc_inspection_allocation_pool_start: 192.168.33.128
6565
provision_oc_inspection_allocation_pool_end: 192.168.33.254
6666
# Native VLAN
6767
provision_oc_physical_network: provision
6868

6969
provision_wl_cidr: 192.168.36.0/24
70-
provision_wl_mtu: 1450
70+
provision_wl_mtu: 1442
7171
provision_wl_inspection_allocation_pool_start: 192.168.36.128
7272
provision_wl_inspection_allocation_pool_end: 192.168.36.254
7373
provision_wl_neutron_allocation_pool_start: 192.168.36.2
@@ -76,7 +76,7 @@ provision_wl_neutron_allocation_pool_end: 192.168.36.127
7676
provision_wl_physical_network: cloud
7777

7878
internal_cidr: 192.168.37.0/24
79-
internal_mtu: 1450
79+
internal_mtu: 1442
8080
internal_allocation_pool_start: 192.168.37.3
8181
internal_allocation_pool_end: 192.168.37.254
8282
internal_vip_address: 192.168.37.2
@@ -89,25 +89,25 @@ external_vlan: 102
8989
external_physical_network: cloud
9090

9191
public_cidr: 192.168.39.0/24
92-
public_mtu: 1450
92+
public_mtu: 1442
9393
public_allocation_pool_start: 192.168.39.3
9494
public_allocation_pool_end: 192.168.39.254
9595
public_vip_address: 192.168.39.2
9696
public_vlan: 103
9797
public_physical_network: cloud
9898

9999
tunnel_cidr: 192.168.40.0/24
100-
tunnel_mtu: 1450
100+
tunnel_mtu: 1442
101101
tunnel_vlan: 104
102102
tunnel_physical_network: cloud
103103

104104
storage_cidr: 192.168.41.0/24
105-
storage_mtu: 1450
105+
storage_mtu: 1442
106106
storage_vlan: 105
107107
storage_physical_network: cloud
108108

109109
storage_mgmt_cidr: 192.168.42.0/24
110-
storage_mgmt_mtu: 1450
110+
storage_mgmt_mtu: 1442
111111
storage_mgmt_vlan: 106
112112
storage_mgmt_physical_network: cloud
113113

etc/kayobe/inventory/group_vars/all/vault

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ seed_hashicorp_registry_password: "{{ stackhpc_docker_registry_password if stack
1010
seed_consul_docker_image: "{{ stackhpc_docker_registry ~ '/' if stackhpc_sync_hashicorp_images | bool else '' }}hashicorp/consul"
1111

1212
# Seed Consul container image tag.
13-
seed_consul_docker_tag: "1.16.3"
13+
seed_consul_docker_tag: "1.16.4"
1414

1515
# Seed Vault container image.
1616
seed_vault_docker_image: "{{ stackhpc_docker_registry ~ '/' if stackhpc_sync_hashicorp_images | bool else '' }}hashicorp/vault"
1717

1818
# Seed Vault container image tag.
19-
seed_vault_docker_tag: "1.14.6"
19+
seed_vault_docker_tag: "1.14.8"
2020

2121
# Seed Vault PKI Role name
2222
seed_vault_pki_role_name: "ServerCert"
@@ -47,13 +47,13 @@ overcloud_hashicorp_registry_password: "{{ stackhpc_docker_registry_password if
4747
overcloud_consul_docker_image: "{{ stackhpc_docker_registry ~ '/' if stackhpc_sync_hashicorp_images | bool else '' }}hashicorp/consul"
4848

4949
# Overcloud Consul container image tag.
50-
overcloud_consul_docker_tag: "1.16.1"
50+
overcloud_consul_docker_tag: "1.16.4"
5151

5252
# Overcloud Vault container image.
5353
overcloud_vault_docker_image: "{{ stackhpc_docker_registry ~ '/' if stackhpc_sync_hashicorp_images | bool else '' }}hashicorp/vault"
5454

5555
# Overcloud Vault container image tag.
56-
overcloud_vault_docker_tag: "1.14.1"
56+
overcloud_vault_docker_tag: "1.14.8"
5757

5858
# Overcloud Vault PKI Default Role name
5959
overcloud_vault_pki_default_role_name: "ServerCert"

etc/kayobe/kolla/config/bifrost/bifrost.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@
55
use_cirros: true
66
cirros_deploy_image_upstream_url: "{{ stackhpc_overcloud_host_image_url }}"
77
{% endif %}
8+
9+
# Disable debug logging to avoid generating large log files
10+
ironic_debug: false

etc/kayobe/pulp-repo-versions.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,16 @@ stackhpc_pulp_repo_rocky_9_1_baseos_version: 20230921T005001
2121
stackhpc_pulp_repo_rocky_9_1_crb_version: 20231020T014922
2222
stackhpc_pulp_repo_rocky_9_1_extras_version: 20231020T014922
2323
stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231020T014922
24-
stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231018T041416
25-
stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231020T014922
26-
stackhpc_pulp_repo_rocky_9_2_crb_version: 20231020T014922
27-
stackhpc_pulp_repo_rocky_9_2_extras_version: 20231001T002904
28-
stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20230918T015928
24+
stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231211T120328
25+
stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231211T120328
26+
stackhpc_pulp_repo_rocky_9_2_crb_version: 20231207T013715
27+
stackhpc_pulp_repo_rocky_9_2_extras_version: 20231207T013715
28+
stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20231208T011702
29+
stackhpc_pulp_repo_rocky_9_3_appstream_version: 20231215T005810
30+
stackhpc_pulp_repo_rocky_9_3_baseos_version: 20231215T005810
31+
stackhpc_pulp_repo_rocky_9_3_crb_version: 20231215T005810
32+
stackhpc_pulp_repo_rocky_9_3_extras_version: 20231211T120328
33+
stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20231214T005538
2934
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20231020T074329
3035
stackhpc_pulp_repo_ubuntu_jammy_version: 20231020T074329
3136
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20231019T125502

etc/kayobe/pulp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ stackhpc_pulp_distribution_deb_production: >-
196196

197197
# Whether to sync Rocky Linux 9 packages.
198198
stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' }}"
199-
# Rocky 9 minor version number. Supported values: 1, 2. Default is 2
200-
stackhpc_pulp_repo_rocky_9_minor_version: 2
199+
# Rocky 9 minor version number. Supported values: 1, 2, 3. Default is 3
200+
stackhpc_pulp_repo_rocky_9_minor_version: 3
201201
# Rocky 9 Snapshot versions. The defaults use the appropriate version from
202202
# pulp-repo-versions.yml for the selected minor release.
203203
stackhpc_pulp_repo_rocky_9_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_appstream_version' % stackhpc_pulp_repo_rocky_9_minor_version) }}"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
features:
3+
- |
4+
Added support for Rocky Linux 9.3 repositories and Kolla containers.
5+
Made 9.3 the default version for Rocky Linux.
6+
- |
7+
Updated Rocky Linux 9.2 pulp repo versions.
8+
Added Rocky Linux 9.3 pulp repo versions.
9+
Rebuilt Kolla containers with Rocky Linux 9.3.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
upgrade:
3+
- |
4+
Bifrost Ironic debug logging is now disabled by default. Change
5+
``ironic_debug`` to ``true`` to revert.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
upgrade:
3+
- |
4+
Updates Consul to 1.16.4 and Vault to 1.14.8.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
fixes:
3+
- |
4+
Bumps OpenSearch heap size to 8 GB, to be identical to Elasticsearch.

0 commit comments

Comments
 (0)