Rename product specific variable names

roles/restore/tasks/cleanup.yml

@@ -4,7 +4,7 @@
   k8s:
     name: "{{ meta.name }}-db-management"
     kind: Pod
-    namespace: "{{ tower_backup_pvc_namespace }}"
+    namespace: "{{ backup_pvc_namespace }}"
     state: absent
     force: true
 
@@ -18,7 +18,7 @@
         namespace: '{{ meta.namespace }}'
         ownerReferences: null
   loop:
-    - '{{ tower_name }}-admin-password'
-    - '{{ tower_name }}-secret-key'
-    - '{{ tower_name }}-postgres-configuration'
-    - '{{ tower_name }}-broadcast-websocket'
+    - '{{ deployment_name }}-admin-password'
+    - '{{ deployment_name }}-secret-key'
+    - '{{ deployment_name }}-postgres-configuration'
+    - '{{ deployment_name }}-broadcast-websocket'

roles/restore/tasks/deploy_awx.yml

@@ -2,10 +2,10 @@
 
 - name: Get AWX object definition from pvc
   k8s_exec:
-    namespace: "{{ tower_backup_pvc_namespace }}"
+    namespace: "{{ backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-
-      bash -c "cat '{{ tower_backup_dir }}/awx_object'"
+      bash -c "cat '{{ backup_dir }}/awx_object'"
   register: awx_object
 
 - name: Set AWX spec variable from backup
@@ -33,6 +33,6 @@
       apiVersion: '{{ api_version }}'
       kind: AWX
       metadata:
-        name: '{{ tower_name }}'
+        name: '{{ deployment_name }}'
         namespace: '{{ meta.namespace }}'
         ownerReferences: null

roles/restore/tasks/init.yml

@@ -6,35 +6,35 @@
     k8s_info:
       api_version: "{{ api_version }}"
       kind: "AWXBackup"
-      name: "{{ tower_backup }}"
-      namespace: "{{ tower_backup_pvc_namespace }}"
+      name: "{{ backup }}"
+      namespace: "{{ backup_pvc_namespace }}"
     register: this_backup
 
   - name: Set backup pvc name from status
     set_fact:
-      tower_backup_pvc: "{{ this_backup['resources'][0]['status']['towerBackupClaim'] }}"
+      backup_pvc: "{{ this_backup['resources'][0]['status']['backupClaim'] }}"
 
   - name: Set tmp backup directory from status
     set_fact:
-      tower_backup_dir: "{{ this_backup['resources'][0]['status']['towerBackupDirectory'] }}"
+      backup_dir: "{{ this_backup['resources'][0]['status']['backupDirectory'] }}"
   when:
-    - tower_backup != '' or tower_backup is defined
+    - backup != '' or backup is defined
 
 # Check to make sure provided pvc exists, error loudly if not.  Otherwise, the management pod will just stay in pending state forever.
 - name: Check provided PVC exists
   k8s_info:
-    name: "{{ tower_backup_pvc }}"
+    name: "{{ backup_pvc }}"
     kind: PersistentVolumeClaim
-    namespace: "{{ tower_backup_pvc_namespace }}"
+    namespace: "{{ backup_pvc_namespace }}"
   register: provided_pvc
   when:
-    - tower_backup_pvc != ''
+    - backup_pvc != ''
 
 - name: Surface error to user
   block:
     - name: Set error message
       set_fact:
-        error_msg: "{{ tower_backup_pvc }} does not exist, please create this pvc first."
+        error_msg: "{{ backup_pvc }} does not exist, please create this pvc first."
 
     - name: Handle error
       import_tasks: error_handling.yml
@@ -43,14 +43,14 @@
       fail:
         msg: "{{ error_msg }}"
   when:
-    - tower_backup_pvc != ''
+    - backup_pvc != ''
     - provided_pvc.resources | length == 0
 
 - name: Delete any existing management pod
   k8s:
     name: "{{ meta.name }}-db-management"
     kind: Pod
-    namespace: "{{ tower_backup_pvc_namespace }}"
+    namespace: "{{ backup_pvc_namespace }}"
     state: absent
     force: true
     wait: true
@@ -65,17 +65,17 @@
 
 - name: Check to make sure backup directory exists on PVC
   k8s_exec:
-    namespace: "{{ tower_backup_pvc_namespace }}"
+    namespace: "{{ backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-
-      bash -c "stat {{ tower_backup_dir }}"
+      bash -c "stat {{ backup_dir }}"
   register: stat_backup_dir
 
 - name: Error if backup dir is missing
   block:
     - name: Set error message
       set_fact:
-        error_msg: "{{ tower_backup_dir }} does not exist, see the towerBackupDirectory status on your AWXBackup for the correct tower_backup_dir."
+        error_msg: "{{ backup_dir }} does not exist, see the backupDirectory status on your AWXBackup for the correct backup_dir."
 
     - name: Handle error
       import_tasks: error_handling.yml
@@ -84,5 +84,5 @@
       fail:
         msg: "{{ error_msg }}"
   when:
-    - tower_backup_dir != ''
+    - backup_dir != ''
     - stat_backup_dir.return_code != 0

roles/restore/tasks/initialize_django.yml

@@ -4,9 +4,9 @@
   k8s_info:
     api_version: v1
     kind: Pod
-    namespace: '{{ tower_backup_pvc_namespace }}'
+    namespace: '{{ backup_pvc_namespace }}'
     label_selectors:
-      - "app.kubernetes.io/name={{ tower_name }}"
+      - "app.kubernetes.io/name={{ deployment_name }}"
       - "app.kubernetes.io/managed-by=awx-operator"
       - "app.kubernetes.io/component=awx"
     field_selectors:

roles/restore/tasks/postgres.yml

@@ -12,7 +12,7 @@
   k8s_info:
     kind: Secret
     namespace: '{{ meta.namespace }}'
-    name: '{{ tower_name }}-postgres-configuration'
+    name: '{{ deployment_name }}-postgres-configuration'
   register: _default_pg_config_resources
 
 - name: Set PostgreSQL configuration
@@ -30,7 +30,7 @@
 
 - name: Default label selector to custom resource generated postgres
   set_fact:
-    postgres_label_selector: "app.kubernetes.io/name={{ tower_name }}-postgres"
+    postgres_label_selector: "app.kubernetes.io/name={{ deployment_name }}-postgres"
   when: postgres_label_selector is not defined
 
 - name: Get the postgres pod information
@@ -83,12 +83,12 @@
 
 - name: Restore database dump to the new postgresql container
   k8s_exec:
-    namespace: "{{ tower_backup_pvc_namespace }}"
+    namespace: "{{ backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: |
       bash -c """
       set -e -o pipefail
-      cat {{ tower_backup_dir }}/tower.db | PGPASSWORD={{ awx_postgres_pass }} {{ psql_restore }}
+      cat {{ backup_dir }}/tower.db | PGPASSWORD={{ awx_postgres_pass }} {{ psql_restore }}
       echo 'Successful'
       """
   register: data_migration

roles/restore/tasks/secrets.yml

@@ -2,10 +2,10 @@
 
 - name: Get secret definition from pvc
   k8s_exec:
-    namespace: "{{ tower_backup_pvc_namespace }}"
+    namespace: "{{ backup_pvc_namespace }}"
     pod: "{{ meta.name }}-db-management"
     command: >-
-      bash -c "cat '{{ tower_backup_dir }}/secrets.yml'"
+      bash -c "cat '{{ backup_dir }}/secrets.yml'"
   register: secrets
 
 - name: Create temp vars file
@@ -22,9 +22,9 @@
 - name: Include secret vars from backup
   include_vars: "{{ secret_vars.path }}"
 
-- name: Set new database host based on supplied tower_name
+- name: Set new database host based on supplied deployment_name
   set_fact:
-    database_host: "{{ tower_name }}-postgres"
+    database_host: "{{ deployment_name }}-postgres"
   when:
     - database_type == 'managed'