Merge pull request #537 from cpanel/RE-745_pruner_cleanup

cpanel · Oct 30, 2024 · 37feb64 · 37feb64
2 parents 1c773ca + 4fdd36e
commit 37feb64
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/openstack/prune_openstack b/.github/workflows/openstack/prune_openstack
@@ -5,8 +5,6 @@ export OS_AUTH_URL=https://keystone.hou-01.cloud.prod.cpanel.net:5000/v3
 export OS_IDENTITY_API_VERSION=3
 export OS_REGION_NAME="RegionOne"
 export OS_INTERFACE=public
-export OS_APPLICATION_CREDENTIAL_ID=${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
-export OS_APPLICATION_CREDENTIAL_SECRET=${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
 
 # two hours ago
 HAMMER_TIME=$(date -d '-2 hour' --utc +"%Y-%m-%dT%H:%M:%SZ")
@@ -63,11 +61,13 @@ remove_volumes () {
 }
 
 # prune VMs
-get_packer_instances
+get_elevatebcl_instances
 remove_stale_instances
 # prune keys
 get_keys
 remove_stale_keys
 # prune volumes
 get_volumes
-remove_volumes
+remove_volumes
+
+exit 0;
diff --git a/.github/workflows/pruner.yml b/.github/workflows/pruner.yml
@@ -6,6 +6,9 @@ on:
 jobs:
     run-pruner:
       runs-on: [self-hosted]
+      env:
+        OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
+        OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
       steps:
         - uses: actions/checkout@v4
         - name: Run Openstack Pruner