diff --git a/roles/backup/tasks/init.yml b/roles/backup/tasks/init.yml index 35aa0a69..fbd00fc7 100644 --- a/roles/backup/tasks/init.yml +++ b/roles/backup/tasks/init.yml @@ -38,7 +38,7 @@ # If tower_backup_pvc is defined, use in management-pod.yml.j2 - name: Set default pvc name set_fact: - _default_backup_pvc: "{{ meta.name }}-backup-claim" + _default_backup_pvc: "{{ tower_name }}-backup-claim" # by default, it will re-use the old pvc if already created (unless a pvc is provided) - name: Set PVC to use for backup diff --git a/roles/backup/templates/backup_pvc.yml.j2 b/roles/backup/templates/backup_pvc.yml.j2 index 57778b82..ba0ae1a3 100644 --- a/roles/backup/templates/backup_pvc.yml.j2 +++ b/roles/backup/templates/backup_pvc.yml.j2 @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: {{ meta.name }}-backup-claim + name: {{ tower_name }}-backup-claim namespace: {{ tower_backup_pvc_namespace }} spec: accessModes: diff --git a/roles/restore/README.md b/roles/restore/README.md index 02eb8124..6439f3f6 100644 --- a/roles/restore/README.md +++ b/roles/restore/README.md @@ -32,7 +32,7 @@ metadata: namespace: my-namespace spec: tower_name: mytower - tower_backup_pvc: awxbackup1-backup-claim + tower_backup_pvc: myoldtower-backup-claim tower_backup_pvc_namespace: 'old-awx-namespace' tower_backup_dir: /backups/tower-openshift-backup-2021-04-02-03:25:08 ``` diff --git a/roles/restore/tasks/init.yml b/roles/restore/tasks/init.yml index c45f7fed..e40a926e 100644 --- a/roles/restore/tasks/init.yml +++ b/roles/restore/tasks/init.yml @@ -1,7 +1,7 @@ --- - name: Set default pvc name set_fact: - _default_backup_pvc: "{{ meta.name }}-backup-claim" + _default_backup_pvc: "{{ tower_name }}-backup-claim" # by default, it will re-use the old pvc if already created (unless pvc is provided) - name: Set PVC to use for backup