From 8adf063b2c1e7fb565f1e950e03aee011a3e1f50 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 31 Aug 2022 17:54:01 +0100 Subject: [PATCH 1/6] Rocky 8: Install a compatible version of ansible in the kolla venv This improves support out of the box. You still need to make sure that you install a compatible version of ansible in the kayobe virtualenv: ``` git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/wallaby cd stackhpc-kayobe-config pip install -U ansible-base@git+https://github.com/stackhpc/ansible@stackhpc/2.10/rocky -e . ``` The above example installs a fork of ansible with support for Rocky 8. --- etc/kayobe/kolla.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 75a93ae92..272173315 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -48,7 +48,12 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}" #kolla_ansible_venv: # Extra requirements to install inside the kolla-ansible virtualenv. -#kolla_ansible_venv_extra_requirements: +kolla_ansible_venv_extra_requirements: "{{ lookup('vars', 'kolla_ansible_venv_extra_requirements_' ~ os_distribution, default=[]) }}" + +# Rocky specific requirements in the kolla-ansible virtualenv +kolla_ansible_venv_extra_requirements_rocky: + # NOTE(wszumski): This is wallaby specific as we can use ansiblec-core 2.11 in Xena. + - 'ansible-base@git+https://github.com/stackhpc/ansible@stackhpc/2.10/rocky' # Pip requirement specifier for the ansible package. NOTE: This limits the # version of ansible used by kolla-ansible to avoid new releases from breaking From 6b2de22b449f30b4ccbbe2a626377de8d44cd894 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Wed, 31 Aug 2022 18:01:43 +0100 Subject: [PATCH 2/6] Update etc/kayobe/kolla.yml --- etc/kayobe/kolla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 272173315..ff7cb0f05 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -52,7 +52,7 @@ kolla_ansible_venv_extra_requirements: "{{ lookup('vars', 'kolla_ansible_venv_ex # Rocky specific requirements in the kolla-ansible virtualenv kolla_ansible_venv_extra_requirements_rocky: - # NOTE(wszumski): This is wallaby specific as we can use ansiblec-core 2.11 in Xena. + # NOTE(wszumski): This is wallaby specific as we can use ansible-core 2.11 in Xena. - 'ansible-base@git+https://github.com/stackhpc/ansible@stackhpc/2.10/rocky' # Pip requirement specifier for the ansible package. NOTE: This limits the From 77a5717a34ad8490d316a1bc46209ba7586c8d7a Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 12 Oct 2022 13:44:52 +0100 Subject: [PATCH 3/6] Terraform aio: reorder KAYOBE_ENVRIONMENT export Place it nearer to where it is used, in case someone uses these instructions without the Terraform part. --- terraform/aio/README.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/terraform/aio/README.rst b/terraform/aio/README.rst index f3b29cda1..3646b757d 100644 --- a/terraform/aio/README.rst +++ b/terraform/aio/README.rst @@ -104,12 +104,6 @@ Apply the changes: terraform apply -auto-approve -Use the ci-aio environment: - -.. code-block:: console - - export KAYOBE_ENVIRONMENT=ci-aio - Write Terraform outputs to a Kayobe config file: .. code-block:: console @@ -152,6 +146,12 @@ Build a Kayobe image: sudo DOCKER_BUILDKIT=1 docker build --file .automation/docker/kayobe/Dockerfile --tag kayobe:latest . +Use the ci-aio environment: + +.. code-block:: console + + export KAYOBE_ENVIRONMENT=ci-aio + Set the Kayobe Vault password env var: .. code-block:: console From 82287c2f0ca33313033363a89859965ec3647fe2 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 25 Oct 2022 13:08:42 +0100 Subject: [PATCH 4/6] CI: prune images over 1 week old on aio runner --- .github/workflows/stackhpc-all-in-one.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/stackhpc-all-in-one.yml b/.github/workflows/stackhpc-all-in-one.yml index 4c0a62f45..c6e9de859 100644 --- a/.github/workflows/stackhpc-all-in-one.yml +++ b/.github/workflows/stackhpc-all-in-one.yml @@ -232,3 +232,8 @@ jobs: OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }} OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }} if: always() + + - name: Prune Docker images over 1 week old + # May fail if another prune is running + run: sudo docker image prune --force --filter until=168h || true + if: always() From 0412d7ed599954e77b616dcd88435ca235c2671e Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Thu, 20 Oct 2022 18:20:29 +0200 Subject: [PATCH 5/6] Build Grafana with additional panel plugin The old version is still required by some (namely Ceph) dashboards. --- etc/kayobe/kolla.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index ff7cb0f05..2ceb49b2b 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -234,7 +234,8 @@ kolla_build_blocks: bifrost_base_header: | ADD additions-archive / grafana_plugins_install: | - RUN grafana-cli plugins install vonage-status-panel + RUN grafana-cli plugins install vonage-status-panel \ + && grafana-cli plugins install grafana-piechart-panel ironic_inspector_header: | ADD additions-archive / prometheus_v2_server_repository_version: | From 23820c4e4afe2e0d90a9823e84530c5e99b8d709 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 2 Nov 2022 11:29:55 +0000 Subject: [PATCH 6/6] Revert "Rocky 8: Install a compatible version of ansible in the kolla venv" This reverts commit 8adf063b2c1e7fb565f1e950e03aee011a3e1f50. It was merged in from stackhpc/wallaby, but is not necessary in Xena. --- etc/kayobe/kolla.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 286a03acc..61b7253e7 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -48,12 +48,7 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}" #kolla_ansible_venv: # Extra requirements to install inside the kolla-ansible virtualenv. -kolla_ansible_venv_extra_requirements: "{{ lookup('vars', 'kolla_ansible_venv_extra_requirements_' ~ os_distribution, default=[]) }}" - -# Rocky specific requirements in the kolla-ansible virtualenv -kolla_ansible_venv_extra_requirements_rocky: - # NOTE(wszumski): This is wallaby specific as we can use ansible-core 2.11 in Xena. - - 'ansible-base@git+https://github.com/stackhpc/ansible@stackhpc/2.10/rocky' +#kolla_ansible_venv_extra_requirements: # Pip requirement specifier for the ansible package. NOTE: This limits the # version of ansible used by kolla-ansible to avoid new releases from breaking