Remove references to stackhpc where possible

azimuth-cloud · Aug 7, 2024 · fe365c9 · fe365c9
1 parent 493ad6f
commit fe365c9
Show file tree

Hide file tree

Showing 42 changed files with 148 additions and 150 deletions.
diff --git a/.github-deploy-prod.yml.sample b/.github-deploy-prod.yml.sample
@@ -50,4 +50,4 @@ jobs:
           ./bin/ensure-venv
           source ./bin/activate  ${{ inputs.environment }}
           ansible-galaxy install -fr ./requirements.yml
-          ansible-playbook stackhpc.azimuth_ops.provision
+          ansible-playbook azimuth_cloud.azimuth_ops.provision
diff --git a/.github-deploy-staging.yml.sample b/.github-deploy-staging.yml.sample
@@ -37,4 +37,4 @@ jobs:
           ./bin/ensure-venv
           source ./bin/activate  ${{ env.azimuth-config-env-name }}
           ansible-galaxy install -fr ./requirements.yml
-          ansible-playbook stackhpc.azimuth_ops.provision
+          ansible-playbook azimuth_cloud.azimuth_ops.provision
diff --git a/.github/actions/destroy/action.yml b/.github/actions/destroy/action.yml
@@ -9,7 +9,7 @@ runs:
         set -e
         source ./ci.env
         source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
-        ansible-playbook stackhpc.azimuth_ops.destroy \
+        ansible-playbook azimuth_cloud.azimuth_ops.destroy \
           -e @extra-vars.yml \
           -e force_destroy=true \
           -e capi_cluster_volumes_policy=delete
@@ -50,7 +50,7 @@ runs:
       if: ${{ always() }}
 
     - name: Release S3 lock
-      uses: stackhpc/github-actions/s3-lock@master
+      uses: azimuth-cloud/github-actions/s3-lock@master
       with:
         host: ${{ steps.s3-lock-config.outputs.host }}
         access-key: ${{ steps.s3-lock-config.outputs.access-key }}

diff --git a/.github/actions/provision/action.yml b/.github/actions/provision/action.yml
@@ -10,4 +10,4 @@ runs:
         set -e
         source ./ci.env
         source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
-        ansible-playbook stackhpc.azimuth_ops.provision -e @extra-vars.yml
+        ansible-playbook azimuth_cloud.azimuth_ops.provision -e @extra-vars.yml
diff --git a/.github/actions/release-notes/release-notes.py b/.github/actions/release-notes/release-notes.py
@@ -66,20 +66,21 @@
     {
         "name": "caas-workstation",
         "path": "roles/azimuth_caas_operator/defaults/main.yml",
-        "version_key": "azimuth_caas_stackhpc_workstation_git_version",
+        "version_key": "azimuth_caas_workstation_default_git_version",
     },
     {
         "name": "caas-repo2docker",
         "path": "roles/azimuth_caas_operator/defaults/main.yml",
-        "version_key": "azimuth_caas_stackhpc_repo2docker_git_version",
+        "version_key": "azimuth_caas_repo2docker_default_git_version",
     },
     {
         "name": "caas-r-studio-server",
         "path": "roles/azimuth_caas_operator/defaults/main.yml",
-        "version_key": "azimuth_caas_stackhpc_rstudio_git_version",
+        "version_key": "azimuth_caas_rstudio_default_git_version",
     },
     {
         "name": "ansible-slurm-appliance",
+        "org": "stackhpc",
         "path": "roles/azimuth_caas_operator/defaults/main.yml",
         "version_key": "azimuth_caas_stackhpc_slurm_appliance_git_version",
     },
@@ -179,7 +180,7 @@ def fetch_component_version_for_ops_tag(session, tag, component):
     Returns the version of the specified component that is used in the specified azimuth-ops tag.
     """
     response = session.get(
-        f"{API_URL}/repos/stackhpc/ansible-collection-azimuth-ops/contents/{component['path']}",
+        f"{API_URL}/repos/azimuth-cloud/ansible-collection-azimuth-ops/contents/{component['path']}",
         params = { "ref": tag },
         headers = { "Content-Type": "application/vnd.github.raw+json" }
     )
@@ -188,15 +189,15 @@ def fetch_component_version_for_ops_tag(session, tag, component):
     return yaml.safe_load(content)[component["version_key"]]
 
 
-def release_notes_for_component(session, name, from_version, to_version):
+def release_notes_for_component(session, name, org, from_version, to_version):
     """
     Produces the release notes for a component between the specified versions.
     """
     print(f"[INFO]   collecting release notes for {name}")
     release_notes = []
     for release in fetch_releases(
         session,
-        f"stackhpc/{name}",
+        f"{org}/{name}",
         min = from_version,
         inclusive_min = False,
         max = to_version,
@@ -233,7 +234,7 @@ def main():
     parser.add_argument(
         "--repo",
         help = "The config repository to target.",
-        default = "stackhpc/azimuth-config"
+        default = "azimuth-cloud/azimuth-config"
     )
     parser.add_argument("tag", help = "The tag to generate release notes for.")
     args = parser.parse_args()
@@ -275,6 +276,7 @@ def main():
             release_notes_for_component(
                 session,
                 "ansible-collection-azimuth-ops",
+                "azimuth-cloud",
                 previous_ops_tag,
                 current_ops_tag
             )
@@ -298,6 +300,7 @@ def main():
                 release_notes_for_component(
                     session,
                     component['name'],
+                    component.get('org', 'azimuth-cloud'),
                     component_vn_previous,
                     component_vn_current
                 )

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -4,7 +4,7 @@ inputs:
   repository:
     description: The repository to use for the Azimuth configuration.
     required: true
-    default: stackhpc/azimuth-config
+    default: azimuth-cloud/azimuth-config
   ref:
     description: The ref to use for the Azimuth configuration.
     required: true
@@ -75,7 +75,7 @@ runs:
         REQUIREMENTS_CONTENT: |
           ---
           collections:
-            - name: https://github.com/stackhpc/ansible-collection-azimuth-ops.git
+            - name: https://github.com/azimuth-cloud/ansible-collection-azimuth-ops.git
               type: git
               version: ${{ inputs.azimuth-ops-version }}
       if: ${{ inputs.azimuth-ops-version != '' }}
@@ -134,7 +134,7 @@ runs:
         echo "bucket=${CI_S3_LOCK_BUCKET}" >> "$GITHUB_OUTPUT"
 
     - name: Acquire S3 lock
-      uses: stackhpc/github-actions/s3-lock@master
+      uses: azimuth-cloud/github-actions/s3-lock@master
       with:
         host: ${{ steps.s3-lock-config.outputs.host }}
         access-key: ${{ steps.s3-lock-config.outputs.access-key }}

diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
@@ -28,7 +28,7 @@ runs:
         set -e
         source ./ci.env
         source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
-        ansible-playbook stackhpc.azimuth_ops.generate_tests -e @extra-vars.yml
+        ansible-playbook azimuth_cloud.azimuth_ops.generate_tests -e @extra-vars.yml
 
     - name: Run test suite
       shell: bash

diff --git a/.github/workflows/test-backup-restore.yml b/.github/workflows/test-backup-restore.yml
@@ -63,7 +63,7 @@ jobs:
           set -e
           source ./ci.env
           source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
-          ansible-playbook stackhpc.azimuth_ops.generate_tests -e @extra-vars.yml
+          ansible-playbook azimuth_cloud.azimuth_ops.generate_tests -e @extra-vars.yml
 
       - name: Create test platforms
         id: tests-create
@@ -115,7 +115,7 @@ jobs:
           set -e
           source ./ci.env
           source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
-          ansible-playbook stackhpc.azimuth_ops.destroy -e @extra-vars.yml
+          ansible-playbook azimuth_cloud.azimuth_ops.destroy -e @extra-vars.yml
         if: ${{ !cancelled() && steps.backup-create.conclusion == 'success' }}
 
       - name: Restore from backup
@@ -124,7 +124,7 @@ jobs:
           set -e
           source ./ci.env
           source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
-          ansible-playbook stackhpc.azimuth_ops.restore \
+          ansible-playbook azimuth_cloud.azimuth_ops.restore \
             -e @extra-vars.yml \
             -e velero_restore_backup_name=$AZIMUTH_ENVIRONMENT
         if: ${{ !cancelled() && steps.azimuth-destroy.conclusion == 'success' }}

diff --git a/.github/workflows/test-singlenode.yml b/.github/workflows/test-singlenode.yml
@@ -55,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Code under test must be from a branch in the azimuth-config repo
-        run: exit ${{ github.repository == 'stackhpc/azimuth-config' && '0' || '1' }}
+        run: exit ${{ github.repository == 'azimuth-cloud/azimuth-config' && '0' || '1' }}
 
   run_azimuth_tests:
     needs: [fail_on_remote]

diff --git a/.github/workflows/test-upgrade.yml b/.github/workflows/test-upgrade.yml
@@ -66,7 +66,7 @@ jobs:
           set -e
           source ./ci.env
           source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
-          ansible-playbook stackhpc.azimuth_ops.generate_tests \
+          ansible-playbook azimuth_cloud.azimuth_ops.generate_tests \
             -e @extra-vars.yml \
             -e generate_tests_include_upgrade_tests=true
 
@@ -123,7 +123,7 @@ jobs:
           set -e
           source ./ci.env
           source ./bin/activate "$AZIMUTH_CONFIG_ENVIRONMENT" "$AZIMUTH_ENVIRONMENT"
-          ansible-playbook stackhpc.azimuth_ops.generate_tests \
+          ansible-playbook azimuth_cloud.azimuth_ops.generate_tests \
             -e @extra-vars.yml \
             -e generate_tests_include_upgrade_tests=true
         if: ${{ !cancelled() && steps.upgrade-azimuth.conclusion == 'success' }}

diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
@@ -16,7 +16,7 @@ jobs:
         include:
           - key: azimuth-ops
             path: ./requirements.yml
-            repository: stackhpc/ansible-collection-azimuth-ops
+            repository: azimuth-cloud/ansible-collection-azimuth-ops
             prereleases: "yes"
             version_jsonpath: collections[0].version
 
@@ -27,25 +27,25 @@ jobs:
 
       - name: Check for most recent GitHub release
         id: next
-        uses: stackhpc/github-actions/github-latest-release@master
+        uses: azimuth-cloud/github-actions/github-latest-release@master
         with:
           repository: ${{ matrix.repository }}
           prereleases: ${{ matrix.prereleases || 'no' }}
 
       - name: Update dependency key
-        uses: stackhpc/github-actions/config-update@master
+        uses: azimuth-cloud/github-actions/config-update@master
         with:
           path: ${{ matrix.path }}
           updates: |
             ${{ matrix.version_jsonpath }}=${{ steps.next.outputs.version }}
 
       - name: Generate app token for PR
-        uses: stackhpc/github-actions/generate-app-token@master
+        uses: azimuth-cloud/github-actions/generate-app-token@master
         id: generate-app-token
         with:
           repository: ${{ github.repository }}
-          app-id: ${{ secrets.APP_ID }}
-          app-private-key: ${{ secrets.APP_PRIVATE_KEY }}
+          app-id: ${{ secrets.AUTOMATION_APP_ID }}
+          app-private-key: ${{ secrets.AUTOMATION_APP_PRIVATE_KEY }}
 
       - name: Propose changes via PR if required
         uses: peter-evans/create-pull-request@v6

diff --git a/.gitlab-ci-magnum.yml.sample b/.gitlab-ci-magnum.yml.sample
@@ -113,7 +113,7 @@ deploy_staging:
   before_script:
     - source ./bin/ci-setup
   script:
-    - ansible-playbook stackhpc.azimuth_ops.provision_capi_mgmt
+    - ansible-playbook azimuth_cloud.azimuth_ops.provision_capi_mgmt
 
 #####
 # This job deploys the Magnum CAPI management cluster to the production environment
@@ -154,4 +154,4 @@ deploy_production:
   before_script:
     - source ./bin/ci-setup
   script:
-    - ansible-playbook stackhpc.azimuth_ops.provision_capi_mgmt
+    - ansible-playbook azimuth_cloud.azimuth_ops.provision_capi_mgmt
diff --git a/.gitlab-ci.yml.sample b/.gitlab-ci.yml.sample
@@ -115,7 +115,7 @@ deploy_aio:
   before_script:
     - source ./bin/ci-setup
   script:
-    - ansible-playbook stackhpc.azimuth_ops.provision
+    - ansible-playbook azimuth_cloud.azimuth_ops.provision
 
 #####
 # This job executes tests against dynamic review environments each time they are deployed
@@ -137,7 +137,7 @@ test_aio:
   before_script:
     - source ./bin/ci-setup
   script:
-    - ansible-playbook stackhpc.azimuth_ops.generate_tests
+    - ansible-playbook azimuth_cloud.azimuth_ops.generate_tests
     # Use the unrestricted application credential to execute the tests, as per the docs
     - OS_CLOUD=unrestricted ./bin/run-tests
 
@@ -177,7 +177,7 @@ stop_aio:
     - git checkout ${CI_COMMIT_SHA} || git checkout main
     - source ./bin/ci-setup
   script:
-    - ansible-playbook stackhpc.azimuth_ops.destroy
+    - ansible-playbook azimuth_cloud.azimuth_ops.destroy
 
 #####
 # This job deploys Azimuth to the staging environment
@@ -212,7 +212,7 @@ deploy_staging:
   before_script:
     - source ./bin/ci-setup
   script:
-    - ansible-playbook stackhpc.azimuth_ops.provision
+    - ansible-playbook azimuth_cloud.azimuth_ops.provision
 
 #####
 # This job executes tests against the staging environment each time it is deployed
@@ -244,7 +244,7 @@ test_staging:
   before_script:
     - source ./bin/ci-setup
   script:
-    - ansible-playbook stackhpc.azimuth_ops.generate_tests
+    - ansible-playbook azimuth_cloud.azimuth_ops.generate_tests
     # Use the unrestricted application credential to execute the tests, as per the docs
     - OS_CLOUD=unrestricted ./bin/run-tests
 
@@ -285,7 +285,7 @@ deploy_production:
   before_script:
     - source ./bin/ci-setup
   script:
-    - ansible-playbook stackhpc.azimuth_ops.provision
+    - ansible-playbook azimuth_cloud.azimuth_ops.provision
 
 #####
 # This job executes tests against the production environment each time it is deployed
@@ -313,6 +313,6 @@ test_production:
   before_script:
     - source ./bin/ci-setup
   script:
-    - ansible-playbook stackhpc.azimuth_ops.generate_tests
+    - ansible-playbook azimuth_cloud.azimuth_ops.generate_tests
     # Use the unrestricted application credential to execute the tests, as per the docs
     - OS_CLOUD=unrestricted ./bin/run-tests
diff --git a/README.md b/README.md
@@ -1,17 +1,17 @@
 # azimuth-config <!-- omit in toc -->
 
 This repository contains utilities and reference configuration for deployments of
-[Azimuth](https://github.com/stackhpc/azimuth), including all the required dependencies.
+[Azimuth](https://github.com/azimuth-cloud/azimuth), including all the required dependencies.
 
 Azimuth is deployed using [Ansible](https://www.ansible.com/) with playbooks from the
-[azimuth-ops Ansible collection](https://github.com/stackhpc/ansible-collection-azimuth-ops).
+[azimuth-ops Ansible collection](https://github.com/azimuth-cloud/ansible-collection-azimuth-ops).
 
 This repository is designed to be forked for a specific site and is structured into multiple
 "environments", allowing common configuration to be shared but overridden where required
 using a layered approach.
 
 ## Documentation
 
-Documentation on deploying Azimuth can be found at https://stackhpc.github.io/azimuth-config/.
+Documentation on deploying Azimuth can be found at https://azimuth-config.readthedocs.io.
 
 The documentation source is in the [docs](./docs/) directory of this repository.
diff --git a/bin/create-merge-branch b/bin/create-merge-branch
@@ -18,7 +18,7 @@ if [ -n "$(git status --short)" ]; then
   exit 1
 fi
 
-UPSTREAM_REPO="${UPSTREAM_REPO:-"stackhpc/azimuth-config"}"
+UPSTREAM_REPO="${UPSTREAM_REPO:-"azimuth-cloud/azimuth-config"}"
 echo "[INFO] Using upstream repo - $UPSTREAM_REPO"
 
 # Fetch the tag for the latest release from the upstream repository

diff --git a/docs/best-practice.md b/docs/best-practice.md
@@ -116,7 +116,7 @@ deployment. It is recommended that this is configured to run automatically for a
 long as the tests are configured to target an isolated project.
 
 A
-[sample GitLab CI/CD configuration](https://github.com/stackhpc/azimuth-config/tree/stable/.gitlab-ci.yml.sample)
+[sample GitLab CI/CD configuration](https://github.com/azimuth-cloud/azimuth-config/tree/stable/.gitlab-ci.yml.sample)
 is provided that implements this workflow for GitLab-hosted repositories.
 
 ## Monitoring

diff --git a/docs/configuration/04-target-cloud.md b/docs/configuration/04-target-cloud.md
@@ -114,7 +114,7 @@ If it cannot find a tagged internal network, the default behaviour is for Azimut
 internal network to use (and the corresponding router to attach it to the external network).
 
 The discovery and auto-creation process is described in detail in
-[Network discovery and auto-creation](https://github.com/stackhpc/azimuth/tree/master/docs/architecture.md#network-discovery-and-auto-creation).
+[Network discovery and auto-creation](https://github.com/azimuth-cloud/azimuth/tree/master/docs/architecture.md#network-discovery-and-auto-creation).
 
 To disable the auto-creation of internal networks, use the following:
 

diff --git a/docs/configuration/09-community-images.md b/docs/configuration/09-community-images.md
@@ -5,11 +5,11 @@ Cluster-as-a-Service appliances and Kubernetes clusters.
 
 Images for Kubernetes and CaaS appliances, with the exception of Slurm, are built using
 [Packer](https://www.packer.io/) from the definitions in the
-[azimuth-images repository](https://github.com/stackhpc/azimuth-images). For Kubernetes,
+[azimuth-images repository](https://github.com/azimuth-cloud/azimuth-images). For Kubernetes,
 we make use of the recipes from the upstream
 [Cluster API image-builder](https://github.com/kubernetes-sigs/image-builder/tree/master/images/capi).
 
-Each [release of azimuth-images](https://github.com/stackhpc/azimuth-images/releases) has
+Each [release of azimuth-images](https://github.com/azimuth-cloud/azimuth-images/releases) has
 an associated manifest that describes the images in the release and where to download them
 from, along with some additional metadata. The Azimuth deployment playbooks are able to
 consume these manifests.
@@ -71,7 +71,7 @@ community_images: {}
     If community images are disabled you will need to ensure suitable images are
     uploaded via another mechanism, and the correct variables populated with the
     image IDs in your Azimuth configuration. See the
-    [azimuth-ops roles](https://github.com/stackhpc/ansible-collection-azimuth-ops/tree/main/roles)
+    [azimuth-ops roles](https://github.com/azimuth-cloud/ansible-collection-azimuth-ops/tree/main/roles)
     for more details.
 
 ## Custom images