Installer: quote password where it applies

Prior to this change, password having shell interpretable character
would break the installer (e.g '&', '(', etc... )

This commits rely on the `quote` filter from ansible to ensure those
password are properly quoted where it applies

Fixes: https://github.com/ansible/awx/issues/3943
Signed-off-by: Yanis Guenane <yguenane@redhat.com>
This commit is contained in:
Yanis Guenane
2019-06-03 11:45:21 +02:00
parent d8a80f9f3e
commit 11630a8803
7 changed files with 14 additions and 14 deletions

View File

@@ -111,7 +111,7 @@ services:
environment:
RABBITMQ_DEFAULT_VHOST: "{{ rabbitmq_default_vhost }}"
RABBITMQ_DEFAULT_USER: "{{ rabbitmq_user }}"
RABBITMQ_DEFAULT_PASS: "{{ rabbitmq_password }}"
RABBITMQ_DEFAULT_PASS: "{{ rabbitmq_password | quote }}"
RABBITMQ_ERLANG_COOKIE: {{ rabbitmq_erlang_cookie }}
http_proxy: {{ http_proxy | default('') }}
https_proxy: {{ https_proxy | default('') }}
@@ -135,7 +135,7 @@ services:
- {{ postgres_data_dir }}:/var/lib/postgresql/data:Z
environment:
POSTGRES_USER: {{ pg_username }}
POSTGRES_PASSWORD: {{ pg_password }}
POSTGRES_PASSWORD: {{ pg_password | quote }}
POSTGRES_DB: {{ pg_database }}
PGDATA: /var/lib/postgresql/data/pgdata
http_proxy: {{ http_proxy | default('') }}

View File

@@ -2,10 +2,10 @@ DATABASE_USER={{ pg_username }}
DATABASE_NAME={{ pg_database }}
DATABASE_HOST={{ pg_hostname|default('postgres') }}
DATABASE_PORT={{ pg_port|default('5432') }}
DATABASE_PASSWORD={{ pg_password }}
DATABASE_PASSWORD={{ pg_password | quote }}
MEMCACHED_HOST={{ memcached_hostname|default('memcached') }}
MEMCACHED_PORT={{ memcached_port|default('11211') }}
RABBITMQ_HOST={{ rabbitmq_hostname|default('rabbitmq') }}
RABBITMQ_PORT={{ rabbitmq_port|default('5672') }}
AWX_ADMIN_USER={{ admin_user }}
AWX_ADMIN_PASSWORD={{ admin_password }}
AWX_ADMIN_PASSWORD={{ admin_password | quote }}