From f6cfcae48a84e5b88513e550133f72a762c62b60 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Fri, 2 May 2025 13:41:46 +0000 Subject: [PATCH 01/10] allow setting packer cleanup option on fatimage builds --- .github/workflows/fatimage.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fatimage.yml b/.github/workflows/fatimage.yml index 38f55db04..8b5eebfc8 100644 --- a/.github/workflows/fatimage.yml +++ b/.github/workflows/fatimage.yml @@ -10,6 +10,11 @@ on: - LEAFCLOUD - SMS - ARCUS + cleanup_on_failure: + description: Cleanup Packer resources on failure + type: boolean + required: true + default: true jobs: openstack: @@ -78,7 +83,7 @@ jobs: packer init . PACKER_LOG=1 packer build \ - -on-error=${{ vars.PACKER_ON_ERROR }} \ + -on-error=${{ github.event.inputs.cleanup_on_failure && 'cleanup' || 'abort' }} \ -var-file=$PKR_VAR_environment_root/${{ env.CI_CLOUD }}.pkrvars.hcl \ -var "source_image_name=${{ matrix.build.source_image_name }}" \ -var "image_name=${{ matrix.build.image_name }}" \ From bc9b8674af1fd334252542e50bef820191ea76bf Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Fri, 2 May 2025 13:48:00 +0000 Subject: [PATCH 02/10] use grafana packages from ark/pulp --- ansible/roles/dnf_repos/defaults/main.yml | 5 +++++ ansible/roles/pulp_site/defaults/main.yml | 2 ++ environments/common/files/grafana/grafana.repo.j2 | 8 ++++++++ environments/common/inventory/group_vars/all/grafana.yml | 3 +++ .../common/inventory/group_vars/all/timestamps.yml | 7 +++++++ 5 files changed, 25 insertions(+) create mode 100644 environments/common/files/grafana/grafana.repo.j2 diff --git a/ansible/roles/dnf_repos/defaults/main.yml b/ansible/roles/dnf_repos/defaults/main.yml index 6d41046ec..d4bab0f22 100644 --- a/ansible/roles/dnf_repos/defaults/main.yml +++ b/ansible/roles/dnf_repos/defaults/main.yml @@ -8,11 +8,13 @@ dnf_repos_filenames: appstream: 'Rocky-AppStream' crb: 'Rocky-PowerTools' extras: 'Rocky-Extras' + grafana: 'grafana' '9': baseos: 'rocky' appstream: 'rocky' crb: 'rocky' extras: 'rocky-extras' + grafana: 'grafana' dnf_repos_version_filenames: "{{ dnf_repos_filenames[ansible_distribution_major_version] }}" @@ -33,6 +35,9 @@ dnf_repos_default_repolist: - file: ceph name: Ceph base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.ceph[ansible_distribution_major_version] | appliances_repo_to_subpath }}" +- file: "{{ dnf_repos_version_filenames.grafana }}" + name: grafana + base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.grafana[ansible_distribution_major_version] | appliances_repo_to_subpath }}" dnf_repos_openhpc_repolist: - name: OpenHPC diff --git a/ansible/roles/pulp_site/defaults/main.yml b/ansible/roles/pulp_site/defaults/main.yml index c549dac53..d30d1bdff 100644 --- a/ansible/roles/pulp_site/defaults/main.yml +++ b/ansible/roles/pulp_site/defaults/main.yml @@ -28,6 +28,8 @@ pulp_site_rpm_info: subpath: "{{ appliances_pulp_repos.openhpc_updates[pulp_site_target_distribution_version_major] | appliances_repo_to_subpath }}" - name: "ceph-{{ pulp_site_target_distribution_version_major }}-{{ appliances_pulp_repos.ceph[pulp_site_target_distribution_version_major].timestamp }}" subpath: "{{ appliances_pulp_repos.ceph[pulp_site_target_distribution_version_major] | appliances_repo_to_subpath }}" +- name: "grafana-{{ pulp_site_target_distribution_version_major }}-{{ appliances_pulp_repos.grafana.timestamp[pulp_site_target_distribution_version_major].timestamp }} + subpath: "{{ appliances_pulp_repos.grafana[pulp_site_target_distribution_version_major] | appliances_repo_to_subpath }}" pulp_site_rpm_repo_defaults: remote_username: "{{ pulp_site_upstream_username }}" diff --git a/environments/common/files/grafana/grafana.repo.j2 b/environments/common/files/grafana/grafana.repo.j2 new file mode 100644 index 000000000..2d77c8e61 --- /dev/null +++ b/environments/common/files/grafana/grafana.repo.j2 @@ -0,0 +1,8 @@ +{{ ansible_managed | comment }} +[grafana] +baseurl = {{ appliances_pulp_url }}/pulp/content/{{ appliances_pulp_repos.grafana[ansible_distribution_major_version] | appliances_repo_to_subpath }} +name = grafana +async = 1 +gpgcheck = 0 +password = {{ dnf_repos_password }} +username = {{ dnf_repos_username }} diff --git a/environments/common/inventory/group_vars/all/grafana.yml b/environments/common/inventory/group_vars/all/grafana.yml index 90ef51c59..9dfda3d02 100644 --- a/environments/common/inventory/group_vars/all/grafana.yml +++ b/environments/common/inventory/group_vars/all/grafana.yml @@ -108,3 +108,6 @@ _grafana_auth_anon_cfg: org_role: Viewer grafana_auth: "{{ _grafana_auth_anon_cfg if grafana_auth_anonymous | bool else {} }}" _grafana_auth_is_anonymous: "{{ grafana_auth.anonymous | default({}) | length > 0 }}" + +# use ark or pulp for grafana as upstream packages disappear: +grafana_yum_repo_template: "{{ appliances_repository_root }}/environments/common/files/grafana/grafana.repo.j2" diff --git a/environments/common/inventory/group_vars/all/timestamps.yml b/environments/common/inventory/group_vars/all/timestamps.yml index f073a9ac6..9927d83d1 100644 --- a/environments/common/inventory/group_vars/all/timestamps.yml +++ b/environments/common/inventory/group_vars/all/timestamps.yml @@ -67,3 +67,10 @@ appliances_pulp_repos: '9': path: OpenHPC/3/updates/EL_9 timestamp: 20241218T154614 + grafana: + '8': + path: grafana/oss/rpm + timestamp: 20250425T003248 + '9': + path: grafana/oss/rpm + timestamp: 20250425T003248 From 72f92e60d2a3f32967cdd2b9ab3018275932a983 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Fri, 2 May 2025 14:21:42 +0000 Subject: [PATCH 03/10] bump CI image --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index 37fa04c35..8dc8aa152 100644 --- a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-250423-1606-b61e2f1a", - "RL9": "openhpc-RL9-250423-1606-b61e2f1a" + "RL8": "openhpc-RL8-250502-1353-bc9b8674", + "RL9": "openhpc-RL9-250502-1353-bc9b8674" } } From 8c14de37e52cf6cffa258a233d453b1fd8500565 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Fri, 2 May 2025 14:47:40 +0000 Subject: [PATCH 04/10] disable grafana repo when templating so existing logic works --- environments/common/files/grafana/grafana.repo.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/environments/common/files/grafana/grafana.repo.j2 b/environments/common/files/grafana/grafana.repo.j2 index 2d77c8e61..c16bf70fe 100644 --- a/environments/common/files/grafana/grafana.repo.j2 +++ b/environments/common/files/grafana/grafana.repo.j2 @@ -1,6 +1,7 @@ {{ ansible_managed | comment }} [grafana] baseurl = {{ appliances_pulp_url }}/pulp/content/{{ appliances_pulp_repos.grafana[ansible_distribution_major_version] | appliances_repo_to_subpath }} +enabled = 0 name = grafana async = 1 gpgcheck = 0 From 0f32bd9e2869da1210bf2c65c0829de90056bb2f Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 6 May 2025 09:15:48 +0000 Subject: [PATCH 05/10] bump grafana from v9 to v10 --- environments/common/inventory/group_vars/all/grafana.yml | 2 +- environments/common/inventory/group_vars/all/timestamps.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environments/common/inventory/group_vars/all/grafana.yml b/environments/common/inventory/group_vars/all/grafana.yml index 9dfda3d02..b03d16f37 100644 --- a/environments/common/inventory/group_vars/all/grafana.yml +++ b/environments/common/inventory/group_vars/all/grafana.yml @@ -2,7 +2,7 @@ # See: https://github.com/cloudalchemy/ansible-grafana # for variable definitions. -grafana_version: '9.5.21' +grafana_version: '10.4.18' # need to copy some role defaults here so we can use in inventory: grafana_port: 3000 diff --git a/environments/common/inventory/group_vars/all/timestamps.yml b/environments/common/inventory/group_vars/all/timestamps.yml index 9927d83d1..2f31ee1a3 100644 --- a/environments/common/inventory/group_vars/all/timestamps.yml +++ b/environments/common/inventory/group_vars/all/timestamps.yml @@ -70,7 +70,7 @@ appliances_pulp_repos: grafana: '8': path: grafana/oss/rpm - timestamp: 20250425T003248 + timestamp: 20250505T025259 '9': path: grafana/oss/rpm - timestamp: 20250425T003248 + timestamp: 20250505T025259 From 841543bad7d145172426258d821d1736e73d5b76 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 6 May 2025 09:44:46 +0000 Subject: [PATCH 06/10] bump CI image --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index 8dc8aa152..2886f8ff9 100644 --- a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-250502-1353-bc9b8674", - "RL9": "openhpc-RL9-250502-1353-bc9b8674" + "RL8": "openhpc-RL8-250506-0918-0f32bd9e", + "RL9": "openhpc-RL9-250506-0918-0f32bd9e" } } From 34fa9813217af817193e46fa29e3602b7e6465a9 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 6 May 2025 10:27:54 +0000 Subject: [PATCH 07/10] fix site failing to template out dnf password for grafana repofile --- environments/common/files/grafana/grafana.repo.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environments/common/files/grafana/grafana.repo.j2 b/environments/common/files/grafana/grafana.repo.j2 index c16bf70fe..30dc4c3ff 100644 --- a/environments/common/files/grafana/grafana.repo.j2 +++ b/environments/common/files/grafana/grafana.repo.j2 @@ -5,5 +5,7 @@ enabled = 0 name = grafana async = 1 gpgcheck = 0 +{% if dnf_repos_password is defined %} password = {{ dnf_repos_password }} username = {{ dnf_repos_username }} +{% endif %} From 938f13e71e35bad87d8fae4a407dc843e8988b75 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 6 May 2025 11:01:50 +0000 Subject: [PATCH 08/10] bump CI image --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index 2886f8ff9..13c6c8de7 100644 --- a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-250506-0918-0f32bd9e", - "RL9": "openhpc-RL9-250506-0918-0f32bd9e" + "RL8": "openhpc-RL8-250506-1030-34fa9813", + "RL9": "openhpc-RL9-250506-1030-34fa9813" } } From abb6394b91a1e16134bd08fc6f159a64c4a7e079 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 6 May 2025 12:28:27 +0000 Subject: [PATCH 09/10] avoid leaking Ark creds from local build into site.yml --- environments/common/files/grafana/grafana.repo.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/common/files/grafana/grafana.repo.j2 b/environments/common/files/grafana/grafana.repo.j2 index 30dc4c3ff..8f1aef5a7 100644 --- a/environments/common/files/grafana/grafana.repo.j2 +++ b/environments/common/files/grafana/grafana.repo.j2 @@ -5,7 +5,7 @@ enabled = 0 name = grafana async = 1 gpgcheck = 0 -{% if dnf_repos_password is defined %} +{% if 'dnf_repos' in group_names and dnf_repos_password is defined %} password = {{ dnf_repos_password }} username = {{ dnf_repos_username }} {% endif %} From 46f6ddd24b1ca3613e5497c875b0666999c2e8ef Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 6 May 2025 13:26:24 +0000 Subject: [PATCH 10/10] bump CI image --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index 13c6c8de7..f9117a26a 100644 --- a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json +++ b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json @@ -1,6 +1,6 @@ { "cluster_image": { - "RL8": "openhpc-RL8-250506-1030-34fa9813", - "RL9": "openhpc-RL9-250506-1030-34fa9813" + "RL8": "openhpc-RL8-250506-1259-abb6394b", + "RL9": "openhpc-RL9-250506-1259-abb6394b" } }