Merge pull request #3987 from Spredzy/quote_password

Installer: quote password where it applies

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

installer/roles/image_push/tasks/main.yml

@@ -3,7 +3,7 @@
   docker_login:
     registry: "{{ docker_registry }}"
     username: "{{ docker_registry_username }}"
-    password: "{{ docker_registry_password }}"
+    password: "{{ docker_registry_password | quote }}"
     reauthorize: yes
   when: docker_registry is defined and docker_registry_password is defined
   delegate_to: localhost

installer/roles/kubernetes/tasks/backup.yml

@@ -49,7 +49,7 @@
 - name: Dump database
   shell: |
     {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} exec ansible-tower-management -- \
-      bash -c "PGPASSWORD={{ pg_password }} \
+      bash -c "PGPASSWORD={{ pg_password | quote }} \
         pg_dump --clean --create \
           --host='{{ pg_hostname | default('postgresql') }}' \
           --port={{ pg_port | default('5432') }} \

installer/roles/kubernetes/tasks/main.yml

@@ -66,8 +66,8 @@
           -e DATABASE_SERVICE_NAME=postgresql  \
           -e POSTGRESQL_MAX_CONNECTIONS={{ pg_max_connections|default(1024) }} \
           -e POSTGRESQL_USER={{ pg_username }} \
-          -e POSTGRESQL_PASSWORD={{ pg_password }} \
+          -e POSTGRESQL_PASSWORD={{ pg_password | quote }} \
-          -e POSTGRESQL_ADMIN_PASSWORD={{ pg_password }} \
+          -e POSTGRESQL_ADMIN_PASSWORD={{ pg_password | quote }} \
           -e POSTGRESQL_DATABASE={{ pg_database }} \
           -e POSTGRESQL_VERSION=9.6 \
           -n {{ kubernetes_namespace }}
@@ -84,7 +84,7 @@
     helm upgrade {{ postgresql_service_name }} --install \
       --namespace {{ kubernetes_namespace }} \
       --set postgresqlUsername={{ pg_username }} \
-      --set postgresqlPassword={{ pg_password }} \
+      --set postgresqlPassword={{ pg_password | quote }} \
       --set postgresqlDatabase={{ pg_database }} \
       --set persistence.size={{ pg_volume_capacity|default('5')}}Gi \
       --version="2.0.0" \

installer/roles/kubernetes/tasks/restore.yml

@@ -75,7 +75,7 @@
 - name: Temporarily grant createdb role
   shell: |
     {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \
-      exec -i ansible-tower-management -- bash -c "PGPASSWORD={{ pg_password }} \
+      exec -i ansible-tower-management -- bash -c "PGPASSWORD={{ pg_password | quote }} \
         psql \
         --host={{ pg_hostname | default('postgresql') }} \
         --port={{ pg_port | default('5432') }} \
@@ -87,7 +87,7 @@
 - name: Perform a PostgreSQL restore
   shell: |
     {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \
-      exec -i ansible-tower-management -- bash -c "PGPASSWORD={{ pg_password }} \
+      exec -i ansible-tower-management -- bash -c "PGPASSWORD={{ pg_password | quote }} \
         psql \
         --host={{ pg_hostname | default('postgresql') }} \
         --port={{ pg_port | default('5432') }} \
@@ -98,7 +98,7 @@
 - name: Revoke createdb role
   shell: |
     {{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \
-      exec -i ansible-tower-management -- bash -c "PGPASSWORD={{ pg_password }} \
+      exec -i ansible-tower-management -- bash -c "PGPASSWORD={{ pg_password | quote }} \
         psql \
         --host={{ pg_hostname | default('postgresql') }} \
         --port={{ pg_port | default('5432') }} \

installer/roles/kubernetes/templates/environment.sh.j2

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

installer/roles/local_docker/templates/docker-compose.yml.j2

@@ -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('') }}

installer/roles/local_docker/templates/environment.sh.j2

@@ -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 }}