Skip to content

Commit f519be5

Browse files
Alex-WelshAlex-Welsh
committed
Move Ansible playbooks to sub-folders
100 playbooks in the same directory are hard for human brains to parse. This change divides them up into sub-directories based on the content of the playbook. Below is a list of all the new categories. Pulp ==== pulp-container-publish.yml pulp-container-sync.yml pulp-host-image-download.yml pulp-repo-promote-production.yml pulp-amphora-image-download.yml pulp-repo-publish.yml pulp-artifact-promote.yml pulp-repo-sync.yml pulp-artifact-upload.yml pulp-sync-publish-promote.yml pulp-auth-proxy.yml Ceph ==== cephadm-keys.yml cephadm-pools.yml cephadm-commands-post.yml cephadm.yml cephadm-commands-pre.yml ceph-enter-maintenance.yml cephadm-crush-rules.yml ceph-exit-maintenance.yml cephadm-deploy.yml cephadm-ec-profiles.yml cephadm-gather-keys.yml Secret Store ==== secret-store-deploy-overcloud.yml secret-store-deploy-seed.yml secret-store-generate-backend-tls.yml secret-store-generate-internal-tls.yml secret-store-generate-test-external-tls.yml secret-store-unseal-overcloud.yml secret-store-unseal-seed.yml secret-store-deploy-barbican.yml Fixes ===== ovn-fix-chassis-priorities.yml run-container-hotfix.yml fix-grub-rl9.yml fix-hostname.yml fix-houston.yml fix-networking.yml hotfix-containers.yml rabbitmq-reset.yml purge-command-not-found.yml Deployment ========== deploy-github-runner.yml deploy-os-capacity-exporter.yml deploy-radosgw-usage-exporter.yml smartmon-tools.yml wazuh-agent.yml wazuh-manager.yml wazuh-secrets.yml write-github-workflows.yml Maintenance =========== nova-compute-disable.yml nova-compute-drain.yml nova-compute-enable.yml reboot.yml rekey-hosts.yml reset-bls-entries.yml stop-openstack-services.yml pci-passthrough.yml ubuntu-upgrade.yml cis.yml octavia-amphora-image-build.yml octavia-amphora-image-register.yml Tools ===== advise-run.yml build-ofed-rocky.yml check-kayobe-version.yml check-kolla-ansible-version.yml check-kolla-images-py.yml check-tags.yml configure-aio-resources.yml configure-vxlan.yml diagnostics.yml docker-registry-login.yml firewalld-watchdog.yml growroot.yml install-doca.yml install-pre-commit-hooks.yml openstack-host-image-upload.yml prometheus-network-names.yml prometheus.yml.j2 push-ofed.yml rsyslog.yml stackhpc-cloud-tests.yml Playbook paths were edited with a set of commands like this: grep -rFIl '/cephadm-keys.yml' tools/ doc/source/ .ansible-lint-ignore etc/ .github/ .automation.conf/ terraform/ | xargs sed -i s:/cephadm-keys.yml:/ceph/cephadm-keys.yml:g Commands were generated for every playbook using some multiline edits in vscode Added scripts for fixing Ansible playbook paths To make the transition easier, this change includes a magic script which will fix symlink paths. Also added docs and fixed existing symlink paths
1 parent 0c77aed commit f519be5

File tree

169 files changed

+443
-242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+443
-242
lines changed

‎.ansible-lint-ignore‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# This file contains ignores to rule violations for ansible-lint
2-
etc/kayobe/ansible/vault-deploy-barbican.yml fqcn[action-core]
3-
etc/kayobe/ansible/vault-generate-backend-tls.yml fqcn[action-core]
4-
etc/kayobe/ansible/vault-generate-internal-tls.yml fqcn[action-core]
5-
etc/kayobe/ansible/vault-generate-test-external-tls.yml fqcn[action-core]
6-
etc/kayobe/ansible/rabbitmq-reset.yml command-instead-of-module
7-
etc/kayobe/ansible/ubuntu-upgrade.yml syntax-check[missing-file]
8-
etc/kayobe/ansible/check-kayobe-version.yml command-instead-of-module
9-
etc/kayobe/ansible/check-kolla-ansible-version.yml command-instead-of-module
2+
etc/kayobe/ansible/vault/vault-deploy-barbican.yml fqcn[action-core]
3+
etc/kayobe/ansible/vault/vault-generate-backend-tls.yml fqcn[action-core]
4+
etc/kayobe/ansible/vault/vault-generate-internal-tls.yml fqcn[action-core]
5+
etc/kayobe/ansible/vault/vault-generate-test-external-tls.yml fqcn[action-core]
6+
etc/kayobe/ansible/fixes/rabbitmq-reset.yml command-instead-of-module
7+
etc/kayobe/ansible/maintenance/ubuntu-upgrade.yml syntax-check[missing-file]
8+
etc/kayobe/ansible/tools/check-kayobe-version.yml command-instead-of-module
9+
etc/kayobe/ansible/tools/check-kolla-ansible-version.yml command-instead-of-module

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ KAYOBE_AUTOMATION_DIR="$(realpath "${PARENT}/../../.automation")"
88

99
function main {
1010
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:-}"
11+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp/pulp-container-sync.yml' -e stackhpc_pulp_images_kolla_filter="${PULP_KOLLA_FILTER:-}"
1212
fi
1313
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:-}"
14+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp/pulp-container-publish.yml' -e stackhpc_pulp_images_kolla_filter="${PULP_KOLLA_FILTER:-}"
1515
fi
1616
if [ "${PULP_DO_REPO_SYNC:-}" = true ]; then
17-
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-repo-sync.yml'
17+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp/pulp-repo-sync.yml'
1818
fi
1919
if [ "${PULP_DO_REPO_PUBLISH:-}" = true ]; then
20-
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-repo-publish.yml'
20+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp/pulp-repo-publish.yml'
2121
fi
2222
if [ "${PULP_DO_REPO_PROMOTE:-}" = true ]; then
23-
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp-repo-promote-production.yml'
23+
${KAYOBE_AUTOMATION_DIR}/scripts/playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/pulp/pulp-repo-promote-production.yml'
2424
fi
2525
}
2626

‎.github/path-filters.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ aio: &aio
1010
- '.github/workflows/stackhpc-build-kayobe-image.yml'
1111
- '.github/workflows/stackhpc-pull-request.yml'
1212
- 'etc/kayobe/*.yml'
13-
- 'etc/kayobe/ansible/configure-aio-resources.yml'
13+
- 'etc/kayobe/ansible/tools/configure-aio-resources.yml'
1414
- 'etc/kayobe/ansible/stackhpc-openstack-tests.yml'
15-
- 'etc/kayobe/ansible/growroot.yml'
15+
- 'etc/kayobe/ansible/tools/growroot.yml'
1616
- 'etc/kayobe/ansible/requirements.yml'
1717
- 'etc/kayobe/ansible/scripts/aio-init.sh'
1818
- 'etc/kayobe/environments/ci-aio/**'

‎.github/workflows/amphora-image-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ jobs:
212212
run: |
213213
source venvs/kayobe/bin/activate &&
214214
source src/kayobe-config/kayobe-env --environment ci-builder &&
215-
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/octavia-amphora-image-build.yml -e amphora_image_dest=/opt/kayobe/images/amphora/amphora-x64-haproxy.qcow2
215+
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/maintenance/octavia-amphora-image-build.yml -e amphora_image_dest=/opt/kayobe/images/amphora/amphora-x64-haproxy.qcow2
216216
env:
217217
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
218218

@@ -231,7 +231,7 @@ jobs:
231231
source venvs/kayobe/bin/activate &&
232232
source src/kayobe-config/kayobe-env --environment ci-builder &&
233233
kayobe playbook run \
234-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
234+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml \
235235
-e artifact_path=/opt/kayobe/images/amphora \
236236
-e artifact_tag=${{ steps.image_tag.outputs.image_tag }} \
237237
-e file_regex="*.qcow2" \

‎.github/workflows/amphora-image-promote.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
source venvs/kayobe/bin/activate &&
6262
source src/kayobe-config/kayobe-env --environment ci-builder &&
6363
kayobe playbook run \
64-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
64+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-promote.yml \
6565
-e repository_name="amphora-images-${{ steps.openstack_release.outputs.openstack_release }}" \
6666
-e pulp_base_path="amphora-images/${{ steps.openstack_release.outputs.openstack_release }}"
6767
env:

‎.github/workflows/ipa-image-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ jobs:
242242
source venvs/kayobe/bin/activate &&
243243
source src/kayobe-config/kayobe-env --environment ci-builder &&
244244
kayobe playbook run \
245-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
245+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml \
246246
-e artifact_path=/opt/kayobe/images/ipa \
247247
-e artifact_type=ipa-images \
248248
-e artifact_tag=${{ steps.ipa_image_tag.outputs.ipa_image_tag }} \
@@ -258,7 +258,7 @@ jobs:
258258
source venvs/kayobe/bin/activate &&
259259
source src/kayobe-config/kayobe-env --environment ci-builder &&
260260
kayobe playbook run \
261-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
261+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml \
262262
-e artifact_path=/opt/kayobe/images/ipa \
263263
-e artifact_type=ipa-images \
264264
-e artifact_tag=${{ steps.ipa_image_tag.outputs.ipa_image_tag }} \
@@ -299,7 +299,7 @@ jobs:
299299
source venvs/kayobe/bin/activate &&
300300
source src/kayobe-config/kayobe-env --environment ci-builder &&
301301
kayobe playbook run \
302-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
302+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml \
303303
-e artifact_path=/opt/kayobe/images/ipa \
304304
-e artifact_type=ipa-images \
305305
-e artifact_tag=${{ steps.ipa_image_tag.outputs.ipa_image_tag }} \
@@ -315,7 +315,7 @@ jobs:
315315
source venvs/kayobe/bin/activate &&
316316
source src/kayobe-config/kayobe-env --environment ci-builder &&
317317
kayobe playbook run \
318-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
318+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml \
319319
-e artifact_path=/opt/kayobe/images/ipa \
320320
-e artifact_type=ipa-images \
321321
-e artifact_tag=${{ steps.ipa_image_tag.outputs.ipa_image_tag }} \

‎.github/workflows/ipa-image-promote.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
source venvs/kayobe/bin/activate &&
7777
source src/kayobe-config/kayobe-env --environment ci-builder &&
7878
kayobe playbook run \
79-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
79+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-promote.yml \
8080
-e artifact_type="ipa-images" \
8181
-e os_distribution='rocky' \
8282
-e os_release='9'
@@ -90,7 +90,7 @@ jobs:
9090
source venvs/kayobe/bin/activate &&
9191
source src/kayobe-config/kayobe-env --environment ci-builder &&
9292
kayobe playbook run \
93-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
93+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-promote.yml \
9494
-e artifact_type="ipa-images" \
9595
-e os_distribution='ubuntu' \
9696
-e os_release='noble'

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ jobs:
253253
source venvs/kayobe/bin/activate &&
254254
source src/kayobe-config/kayobe-env --environment ci-builder &&
255255
kayobe playbook run \
256-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
256+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml \
257257
-e artifact_path=/opt/kayobe/images/overcloud-rocky-9 \
258258
-e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
259259
-e artifact_type="kayobe-images" \
@@ -269,7 +269,7 @@ jobs:
269269
source venvs/kayobe/bin/activate &&
270270
source src/kayobe-config/kayobe-env --environment ci-builder &&
271271
kayobe playbook run \
272-
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
272+
src/kayobe-config/etc/kayobe/ansible/tools/openstack-host-image-upload.yml \
273273
-e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
274274
-e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }}
275275
env:
@@ -283,7 +283,7 @@ jobs:
283283
source venvs/kayobe/bin/activate &&
284284
source src/kayobe-config/kayobe-env --environment ci-builder &&
285285
kayobe playbook run \
286-
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
286+
src/kayobe-config/etc/kayobe/ansible/tools/openstack-host-image-upload.yml \
287287
-e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
288288
-e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }}
289289
env:
@@ -321,7 +321,7 @@ jobs:
321321
source venvs/kayobe/bin/activate &&
322322
source src/kayobe-config/kayobe-env --environment ci-builder &&
323323
kayobe playbook run \
324-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
324+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-upload.yml \
325325
-e artifact_path=/opt/kayobe/images/overcloud-ubuntu-noble \
326326
-e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
327327
-e artifact_type="kayobe-images" \
@@ -337,7 +337,7 @@ jobs:
337337
source venvs/kayobe/bin/activate &&
338338
source src/kayobe-config/kayobe-env --environment ci-builder &&
339339
kayobe playbook run \
340-
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
340+
src/kayobe-config/etc/kayobe/ansible/tools/openstack-host-image-upload.yml \
341341
-e local_image_path="/opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.qcow2" \
342342
-e image_name=overcloud-ubuntu-noble-${{ steps.host_image_tag.outputs.host_image_tag }}
343343
env:
@@ -351,7 +351,7 @@ jobs:
351351
source venvs/kayobe/bin/activate &&
352352
source src/kayobe-config/kayobe-env --environment ci-builder &&
353353
kayobe playbook run \
354-
src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
354+
src/kayobe-config/etc/kayobe/ansible/tools/openstack-host-image-upload.yml \
355355
-e local_image_path="/opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.qcow2" \
356356
-e image_name=overcloud-ubuntu-noble-${{ steps.host_image_tag.outputs.host_image_tag }}
357357
env:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
source venvs/kayobe/bin/activate &&
7777
source src/kayobe-config/kayobe-env --environment ci-builder &&
7878
kayobe playbook run \
79-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
79+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-promote.yml \
8080
-e artifact_type="kayobe-images" \
8181
-e os_distribution='rocky' \
8282
-e os_release='9'
@@ -90,7 +90,7 @@ jobs:
9090
source venvs/kayobe/bin/activate &&
9191
source src/kayobe-config/kayobe-env --environment ci-builder &&
9292
kayobe playbook run \
93-
src/kayobe-config/etc/kayobe/ansible/pulp-artifact-promote.yml \
93+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-artifact-promote.yml \
9494
-e artifact_type="kayobe-images" \
9595
-e os_distribution='ubuntu' \
9696
-e os_release='noble'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
source venvs/kayobe/bin/activate &&
119119
source src/kayobe-config/kayobe-env --environment ${{ inputs.kayobe-environment }} &&
120120
kayobe playbook run \
121-
src/kayobe-config/etc/kayobe/ansible/pulp-host-image-download.yml \
121+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-host-image-download.yml \
122122
-e os_distribution="rocky" \
123123
-e os_release="9"
124124
env:
@@ -163,7 +163,7 @@ jobs:
163163
source venvs/kayobe/bin/activate &&
164164
source src/kayobe-config/kayobe-env --environment ${{ inputs.kayobe-environment }} &&
165165
kayobe playbook run \
166-
src/kayobe-config/etc/kayobe/ansible/pulp-host-image-download.yml \
166+
src/kayobe-config/etc/kayobe/ansible/pulp/pulp-host-image-download.yml \
167167
-e os_distribution="ubuntu" \
168168
-e os_release="noble"
169169
env:

0 commit comments

Comments
 (0)