Merge pull request #83 from Spredzy/database_configuration

PostgreSQL: Remove unused/wrongly used variable

roles/awx/defaults/main.yml

@@ -68,15 +68,11 @@ tower_web_extra_volume_mounts: ''
 
 tower_redis_image: redis:latest
 
-tower_postgres_pass: awxpass
 tower_postgres_image: postgres:12
 tower_postgres_storage_request: 8Gi
 tower_postgres_storage_class: ''
-
 tower_postgres_data_path: '/var/lib/postgresql/data/pgdata'
 
-tower_postgres_port: 5432
-
 ca_trust_bundle: "/etc/pki/tls/certs/ca-bundle.crt"
 
 development_mode: false

roles/awx/templates/tower_config.yaml.j2

@@ -13,7 +13,7 @@ data:
     DATABASE_NAME=awx
     DATABASE_HOST='{{ meta.name }}-postgres.{{ meta.namespace }}.svc.cluster.local'
     DATABASE_PORT='5432'
-    DATABASE_PASSWORD={{ tower_postgres_pass | quote }}
+    DATABASE_PASSWORD={{ awx_postgres_pass | quote }}
     AWX_SKIP_MIGRATIONS=true
 
   settings: |
@@ -90,7 +90,7 @@ data:
             'ENGINE': 'awx.main.db.profiled_pg',
             'NAME': 'awx',
             'USER': 'awx',
-            'PASSWORD': '{{ tower_postgres_pass | quote }}',
+            'PASSWORD': '{{ awx_postgres_pass | quote }}',
             'HOST': '{{ meta.name }}-postgres.{{ meta.namespace }}.svc.cluster.local',
             'PORT': '5432',
         }