Skip to content

Commit 9bfcaa3

Browse files
bbezakbbezak
authored
Merge branch 'stackhpc/2024.1' into cross-arch-builds-2024.1
2 parents dcb14a4 + 0f5a5e0 commit 9bfcaa3

14 files changed

+134
-24
lines changed

‎.automation‎

‎.automation.conf/run-books/pulp-sync-content.sh‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/bash
2+
3+
set -euE
4+
set -o pipefail
5+
6+
PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
7+
KAYOBE_AUTOMATION_DIR="$(realpath "${PARENT}/../../.automation")"
8+
9+
function main {
10+
if [ "${PULP_DO_CONTAINER_SYNC:-}" = true ]; then
11+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-container-sync.yml' -e stackhpc_pulp_images_kolla_filter="${PULP_KOLLA_FILTER:-}"
12+
fi
13+
if [ "${PULP_DO_CONTAINER_PUBLISH:-}" = true ]; then
14+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-container-publish.yml' -e stackhpc_pulp_images_kolla_filter="${PULP_KOLLA_FILTER:-}"
15+
fi
16+
if [ "${PULP_DO_REPO_SYNC:-}" = true ]; then
17+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-repo-sync.yml'
18+
fi
19+
if [ "${PULP_DO_REPO_PUBLISH:-}" = true ]; then
20+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-repo-publish.yml'
21+
fi
22+
if [ "${PULP_DO_REPO_PROMOTE:-}" = true ]; then
23+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-repo-promote-production.yml'
24+
fi
25+
}
26+
27+
if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
28+
main
29+
fi

‎.github/workflows/overcloud-host-image-build.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ jobs:
3232
runs-on: arc-skc-host-image-builder-runner
3333
permissions: {}
3434
steps:
35+
- name: Validate inputs
36+
run: |
37+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
38+
echo "At least one distribution must be selected"
39+
exit 1
40+
fi
41+
3542
- name: Install Package
3643
uses: ConorMacBride/install-package@main
3744
with:

‎.github/workflows/overcloud-host-image-promote.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ jobs:
2323
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
2424
runs-on: ubuntu-22.04
2525
steps:
26+
- name: Validate inputs
27+
run: |
28+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
29+
echo "At least one distribution must be selected"
30+
exit 1
31+
fi
32+
2633
- uses: actions/checkout@v4
2734
with:
2835
path: src/kayobe-config

‎.github/workflows/overcloud-host-image-upload.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ jobs:
3434
runs-on: arc-skc-host-image-builder-runner
3535
permissions: {}
3636
steps:
37+
- name: Validate inputs
38+
run: |
39+
if [[ ${{ inputs.rocky9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
40+
echo "At least one distribution must be selected"
41+
exit 1
42+
fi
43+
3744
- name: Install package dependencies
3845
run: |
3946
sudo apt update

‎.github/workflows/stackhpc-container-image-build.yml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ on:
99
required: false
1010
default: ""
1111
overcloud:
12-
description: Build overcloud images?
12+
description: Build container images for overcloud services?
1313
type: boolean
1414
required: false
1515
default: true
1616
seed:
17-
description: Build seed images?
17+
description: Build container images for seed services?
1818
type: boolean
1919
required: false
2020
default: false
@@ -52,6 +52,17 @@ jobs:
5252
matrix: ${{ steps.set-matrix.outputs.matrix }}
5353
openstack_release: ${{ steps.openstack_release.outputs.openstack_release }}
5454
steps:
55+
- name: Validate inputs
56+
run: |
57+
if [[ ${{ inputs.rocky-linux-9 }} == 'false' && ${{ inputs.ubuntu-jammy }} == 'false' ]]; then
58+
echo "At least one distribution must be selected"
59+
exit 1
60+
fi
61+
if [[ ${{ inputs.overcloud }} == 'false' && ${{ inputs.seed }} == 'false' ]]; then
62+
echo "At least one of overcloud or seed must be selected"
63+
exit 1
64+
fi
65+
5566
- name: Checkout
5667
uses: actions/checkout@v4
5768

‎doc/source/contributor/environments/ci-multinode.rst‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,15 @@ is not enabled by default. To enable it, set the following in
3535
kolla_enable_manila: true
3636
kolla_enable_manila_backend_cephfs_native: true
3737
38-
And re-run ``kayobe overcloud service deploy`` if you are working on an existing
39-
deployment.
38+
If you are working on an existing deployment, you need to do the following first.
39+
40+
1. Create CephFS pools: ``kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/cephadm-pools.yml``
41+
2. Create cephx key for Manila: ``kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/cephadm-keys.yml``
42+
3. Run Manila related Ceph commands: ``kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/cephadm-commands-post.yml``
43+
4. Gather Ceph configuration and keyring for Manila: ``kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/cephadm-gather-keys.yml``
44+
5. Configure Storage network on Seed node: ``kayobe seed host configure -t network,ip-allocation,snat``
45+
46+
Then, run ``kayobe overcloud service deploy`` to deploy Manila.
4047

4148
To test it, you will need two virtual machines. Cirros does not support the Ceph
4249
kernel client, so you will need to use a different image. Any regular Linux
@@ -108,35 +115,35 @@ Then create a share type and share:
108115

109116
.. code-block:: bash
110117
111-
manila type-create cephfs-type false --is_public true
112-
manila type-key cephfs-type set vendor_name=Ceph storage_protocol=CEPHFS
113-
manila create --name test-share --share-type cephfs-type CephFS 2
118+
openstack share type create cephfs-type false --public true
119+
openstack share type set cephfs-type --extra-specs vendor_name=Ceph, storage_protocol=CEPHFS
120+
openstack share create --name test-share --share-type cephfs-type --public true CephFS 2
114121
115122
Wait until the share is available:
116123

117124
.. code-block:: bash
118125
119-
manila list
126+
openstack share list
120127
121128
Then allow access to the shares to two users:
122129

123130
.. code-block:: bash
124131
125-
manila access-allow test-share cephx alice
126-
manila access-allow test-share cephx bob
132+
openstack share access create test-share cephx alice
133+
openstack share access create test-share cephx bob
127134
128135
Show the access list to make sure the state of both entries is ``active`` and
129136
take note of the access keys:
130137

131138
.. code-block:: bash
132139
133-
manila access-list test-share
140+
openstack share access list test-share
134141
135142
And take note of the path to the share:
136143

137144
.. code-block:: bash
138145
139-
manila share-export-location-list test-share
146+
openstack share export location list test-share
140147
141148
SSH into the first instance, create a directory for the share, and mount it:
142149

‎doc/source/operations/upgrading-openstack.rst‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,11 @@ configuration.
124124
Known issues
125125
============
126126

127-
* OVN breaks on Rocky 9 deployments where hostnames are FQDNs.
128-
Before upgrading, you must make sure no compute or controller nodes have any
129-
``.`` characters in their hostnames. Run the command below to check:
130-
131-
.. code-block:: bash
132-
133-
kayobe overcloud host command run --command "grep -v \'\.\' /etc/hostname" --show-output
134-
135-
There is currently no known fix for this issue aside from reprovisioning. A
136-
patch will be developed soon.
127+
* Due to an incorrect default value NGS will attempt to use v3alpha for the api
128+
path when communicating with etcd3. This isn't possible as in Caracal etcd is
129+
running a newer version that has dropped support for v3alpha. You can work
130+
around this in custom config, see the SMS PR for an example:
131+
https://github.com/stackhpc/smslab-kayobe-config/pull/354
137132

138133
Security baseline
139134
=================

‎etc/kayobe/ansible/requirements.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ collections:
1111
- name: stackhpc.hashicorp
1212
version: 2.5.1
1313
- name: stackhpc.kayobe_workflows
14-
version: 1.0.3
14+
version: 1.1.0
1515
roles:
1616
- src: stackhpc.vxlan
1717
- name: ansible-lockdown.ubuntu22_cis

‎etc/kayobe/kolla-image-tags.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,12 @@ kolla_image_tags:
2828
ubuntu-jammy: 2024.1-ubuntu-jammy-20240910T072617
2929
rabbitmq:
3030
rocky-9: 2024.1-rocky-9-20240927T152945
31+
ironic:
32+
rocky-9: 2024.1-rocky-9-20241022T090648
33+
ubuntu-jammy: 2024.1-ubuntu-jammy-20241022T090648
34+
ironic_dnsmasq:
35+
rocky-9: 2024.1-rocky-9-20241022T090648
36+
ubuntu-jammy: 2024.1-ubuntu-jammy-20241022T090648
37+
ironic_neutron_agent:
38+
rocky-9: 2024.1-rocky-9-20241022T090648
39+
ubuntu-jammy: 2024.1-ubuntu-jammy-20241022T090648

0 commit comments

Comments
 (0)