From 2daae0879085aa50529442841bf2008c4b6e3346 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Fri, 5 Feb 2021 16:11:28 +0100 Subject: [PATCH] PostgreSQL: Remove unused/wrongly used variable --- roles/awx/defaults/main.yml | 4 ---- roles/awx/templates/tower_config.yaml.j2 | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/roles/awx/defaults/main.yml b/roles/awx/defaults/main.yml index 21ebc5c9..815fabf7 100644 --- a/roles/awx/defaults/main.yml +++ b/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 diff --git a/roles/awx/templates/tower_config.yaml.j2 b/roles/awx/templates/tower_config.yaml.j2 index 77152541..43d8853b 100644 --- a/roles/awx/templates/tower_config.yaml.j2 +++ b/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', }