diff --git a/ansible/templates/role.yml.j2 b/ansible/templates/role.yml.j2 index ce13ebc3..80405470 100644 --- a/ansible/templates/role.yml.j2 +++ b/ansible/templates/role.yml.j2 @@ -79,6 +79,6 @@ rules: - awx.ansible.com resources: - '*' - - backups + - awxbackups verbs: - '*' diff --git a/deploy/crds/awx.ansible.com_backups_crd.yaml b/deploy/crds/awx.ansible.com_awxbackups_crd.yaml similarity index 100% rename from deploy/crds/awx.ansible.com_backups_crd.yaml rename to deploy/crds/awx.ansible.com_awxbackups_crd.yaml diff --git a/deploy/crds/awx.ansible.com_v1beta1_backup_cr.yaml b/deploy/crds/awx.ansible.com_v1beta1_awxbackup_cr.yaml similarity index 100% rename from deploy/crds/awx.ansible.com_v1beta1_backup_cr.yaml rename to deploy/crds/awx.ansible.com_v1beta1_awxbackup_cr.yaml diff --git a/roles/backup/defaults/main.yml b/roles/backup/defaults/main.yml index dbb48bf8..0c33617d 100644 --- a/roles/backup/defaults/main.yml +++ b/roles/backup/defaults/main.yml @@ -1,3 +1,16 @@ --- -deployment_type: "awx" -tower_postgres_image: postgres:12 + +# Specify a pre-created PVC (name) to backup to +tower_backup_pvc: '' + +# Size of backup PVC if created dynamically +tower_backup_size: '' + +# Specify storage class to determine how to dynamically create PVC's with +tower_backup_storage_class: '' + +# Secret Names +tower_secret_key_secret: "{{ meta.name }}-secret-key" +tower_admin_password_secret: "{{ meta.name }}-admin-password" +tower_broadcast_websocket_secret: "{{ meta.name }}-broadcast-websocket" +tower_postgres_configuration_secret: "{{ meta.name }}-postgres-configuration" diff --git a/roles/backup/vars/main.yml b/roles/backup/vars/main.yml index 0c33617d..851b98f0 100644 --- a/roles/backup/vars/main.yml +++ b/roles/backup/vars/main.yml @@ -1,16 +1,4 @@ --- -# Specify a pre-created PVC (name) to backup to -tower_backup_pvc: '' - -# Size of backup PVC if created dynamically -tower_backup_size: '' - -# Specify storage class to determine how to dynamically create PVC's with -tower_backup_storage_class: '' - -# Secret Names -tower_secret_key_secret: "{{ meta.name }}-secret-key" -tower_admin_password_secret: "{{ meta.name }}-admin-password" -tower_broadcast_websocket_secret: "{{ meta.name }}-broadcast-websocket" -tower_postgres_configuration_secret: "{{ meta.name }}-postgres-configuration" +deployment_type: "awx" +tower_postgres_image: postgres:12