Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6bd3c5e
Merge pull request #872 from stackhpc/zed-yoga-merge
markgoddard Jan 15, 2024
359ee38
CI: Fix default kayobe base image when built on push
markgoddard Jan 15, 2024
85d0798
Merge pull request #874 from stackhpc/zed-fix-build-kayobe-image
markgoddard Jan 15, 2024
1ace0c2
Update to Rocky Linux 9.3 (#828)
seunghun1ee Jan 16, 2024
175150c
Add warning about interface name change from hw_machine_type
MoteHue Jan 17, 2024
d373d45
Update doc/source/operations/rocky-linux-9.rst
MoteHue Jan 17, 2024
710a7f1
Merge pull request #879 from stackhpc/clarifiy-user-impact-of-hw_mach…
MoteHue Jan 17, 2024
bcc7f6f
Lower the MTU in aufn-ceph so it can run in a VM
MoteHue Jan 17, 2024
e4a65f3
AUFN-Ceph: Skip docker registry login before pulp is deployed
MoteHue Jan 17, 2024
c6ed1bc
Update Consul and Vault to latest MPL releases
priteau Jan 18, 2024
415eeda
Add tempest-artifacts to gitignore
Alex-Welsh Jan 18, 2024
4345beb
Merge pull request #880 from stackhpc/aufn-ceph-lower-mtu-for-geneve
MoteHue Jan 18, 2024
6c03399
Disable Bifrost Ironic debug logging
priteau Jan 18, 2024
900ebb7
Merge pull request #883 from stackhpc/bifrost-disable-ironic-debug
priteau Jan 18, 2024
f5f079c
Merge pull request #882 from stackhpc/tempest-artifacts-gitignore
Alex-Welsh Jan 19, 2024
313faf3
Set OpenSearch heap size
priteau Jan 19, 2024
a75ece3
Update .automation checkout for rsync patch
Alex-Welsh Jan 19, 2024
68c4361
Merge pull request #881 from stackhpc/hashicorp-bump
priteau Jan 19, 2024
ec8ef4f
Merge pull request #886 from stackhpc/os-heap-size
priteau Jan 19, 2024
e1a64bd
Merge pull request #887 from stackhpc/update-kayobe-automation
Alex-Welsh Jan 19, 2024
ee362ae
Merge branch 'stackhpc/yoga' into sync-zed
Alex-Welsh Jan 19, 2024
06eda56
Merge branch 'sync-zed' into merge-antelope
Alex-Welsh Jan 19, 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
2 changes: 1 addition & 1 deletion .github/workflows/stackhpc-build-kayobe-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
build-args: |
http_proxy=${{ inputs.http_proxy }}
https_proxy=${{ inputs.https_proxy }}
BASE_IMAGE=${{ inputs.base_image }}
BASE_IMAGE=${{ inputs.base_image || 'rockylinux:9' }}
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@ etc/kayobe/environments/aufn-ceph/kolla/config/cinder/ceph.conf
etc/kayobe/environments/aufn-ceph/kolla/config/cinder/ceph.client.glance.keyring
etc/kayobe/environments/aufn-ceph/kolla/config/nova/ceph.conf
etc/kayobe/environments/aufn-ceph/kolla/config/nova/ceph.client.glance.keyring

# Tempest logs
tempest-artifacts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ kayobe seed vm provision
kayobe seed host configure

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

# Deploying the seed restarts networking interface, run configure-local-networking.sh again to re-add routes.
$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/configure-local-networking.sh
Expand Down
16 changes: 8 additions & 8 deletions etc/kayobe/environments/aufn-ceph/networks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,19 @@ cleaning_net_name: provision_wl
# Network definitions.

mgmt_cidr: 192.168.35.0/24
mgmt_mtu: 1450
mgmt_mtu: 1442
# Native VLAN
mgmt_physical_network: mgmt

provision_oc_cidr: 192.168.33.0/24
provision_oc_mtu: 1450
provision_oc_mtu: 1442
provision_oc_inspection_allocation_pool_start: 192.168.33.128
provision_oc_inspection_allocation_pool_end: 192.168.33.254
# Native VLAN
provision_oc_physical_network: provision

provision_wl_cidr: 192.168.36.0/24
provision_wl_mtu: 1450
provision_wl_mtu: 1442
provision_wl_inspection_allocation_pool_start: 192.168.36.128
provision_wl_inspection_allocation_pool_end: 192.168.36.254
provision_wl_neutron_allocation_pool_start: 192.168.36.2
Expand All @@ -76,7 +76,7 @@ provision_wl_neutron_allocation_pool_end: 192.168.36.127
provision_wl_physical_network: cloud

internal_cidr: 192.168.37.0/24
internal_mtu: 1450
internal_mtu: 1442
internal_allocation_pool_start: 192.168.37.3
internal_allocation_pool_end: 192.168.37.254
internal_vip_address: 192.168.37.2
Expand All @@ -89,25 +89,25 @@ external_vlan: 102
external_physical_network: cloud

public_cidr: 192.168.39.0/24
public_mtu: 1450
public_mtu: 1442
public_allocation_pool_start: 192.168.39.3
public_allocation_pool_end: 192.168.39.254
public_vip_address: 192.168.39.2
public_vlan: 103
public_physical_network: cloud

tunnel_cidr: 192.168.40.0/24
tunnel_mtu: 1450
tunnel_mtu: 1442
tunnel_vlan: 104
tunnel_physical_network: cloud

storage_cidr: 192.168.41.0/24
storage_mtu: 1450
storage_mtu: 1442
storage_vlan: 105
storage_physical_network: cloud

storage_mgmt_cidr: 192.168.42.0/24
storage_mgmt_mtu: 1450
storage_mgmt_mtu: 1442
storage_mgmt_vlan: 106
storage_mgmt_physical_network: cloud

Expand Down
8 changes: 4 additions & 4 deletions etc/kayobe/inventory/group_vars/all/vault
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ seed_hashicorp_registry_password: "{{ stackhpc_docker_registry_password if stack
seed_consul_docker_image: "{{ stackhpc_docker_registry ~ '/' if stackhpc_sync_hashicorp_images | bool else '' }}hashicorp/consul"

# Seed Consul container image tag.
seed_consul_docker_tag: "1.16.3"
seed_consul_docker_tag: "1.16.4"

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

# Seed Vault container image tag.
seed_vault_docker_tag: "1.14.6"
seed_vault_docker_tag: "1.14.8"

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

# Overcloud Consul container image tag.
overcloud_consul_docker_tag: "1.16.1"
overcloud_consul_docker_tag: "1.16.4"

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

# Overcloud Vault container image tag.
overcloud_vault_docker_tag: "1.14.1"
overcloud_vault_docker_tag: "1.14.8"

# Overcloud Vault PKI Default Role name
overcloud_vault_pki_default_role_name: "ServerCert"
Expand Down
3 changes: 3 additions & 0 deletions etc/kayobe/kolla/config/bifrost/bifrost.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
use_cirros: true
cirros_deploy_image_upstream_url: "{{ stackhpc_overcloud_host_image_url }}"
{% endif %}

# Disable debug logging to avoid generating large log files
ironic_debug: false
15 changes: 10 additions & 5 deletions etc/kayobe/pulp-repo-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,16 @@ stackhpc_pulp_repo_rocky_9_1_baseos_version: 20230921T005001
stackhpc_pulp_repo_rocky_9_1_crb_version: 20231020T014922
stackhpc_pulp_repo_rocky_9_1_extras_version: 20231020T014922
stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231020T014922
stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231018T041416
stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231020T014922
stackhpc_pulp_repo_rocky_9_2_crb_version: 20231020T014922
stackhpc_pulp_repo_rocky_9_2_extras_version: 20231001T002904
stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20230918T015928
stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231211T120328
stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231211T120328
stackhpc_pulp_repo_rocky_9_2_crb_version: 20231207T013715
stackhpc_pulp_repo_rocky_9_2_extras_version: 20231207T013715
stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20231208T011702
stackhpc_pulp_repo_rocky_9_3_appstream_version: 20231215T005810
stackhpc_pulp_repo_rocky_9_3_baseos_version: 20231215T005810
stackhpc_pulp_repo_rocky_9_3_crb_version: 20231215T005810
stackhpc_pulp_repo_rocky_9_3_extras_version: 20231211T120328
stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20231214T005538
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20231020T074329
stackhpc_pulp_repo_ubuntu_jammy_version: 20231020T074329
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20231019T125502
4 changes: 2 additions & 2 deletions etc/kayobe/pulp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ stackhpc_pulp_distribution_deb_production: >-

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