mirror of
https://github.com/ansible/awx.git
synced 2024-10-27 09:25:10 +03:00
Dont require pg_admin_password unless we're using it.
This commit is contained in:
parent
68c26014cc
commit
24da2b78b8
@ -84,11 +84,14 @@ pg_username=awx
|
||||
# pg_password should be random 10 character alphanumeric string, when postgresql is running on kubernetes
|
||||
# NB: it's a limitation of the "official" postgres helm chart
|
||||
pg_password=awxpass
|
||||
pg_admin_password=postgrespass
|
||||
pg_database=awx
|
||||
pg_port=5432
|
||||
#pg_sslmode=require
|
||||
|
||||
# The following variable is only required when using the provided
|
||||
# containerized postgres deployment on OpenShift
|
||||
# pg_admin_password=postgrespass
|
||||
|
||||
# RabbitMQ Configuration
|
||||
rabbitmq_password=awxpass
|
||||
rabbitmq_erlang_cookie=cookiemonster
|
||||
|
@ -46,3 +46,10 @@
|
||||
- docker_registry_password is defined and docker_registry_password != ''
|
||||
msg: "Set the value of 'docker_registry_password' in the inventory file."
|
||||
when: dockerhub_base is not defined
|
||||
|
||||
- name: pg_admin_password should be defined
|
||||
assert:
|
||||
that:
|
||||
- pg_admin_password is defined and pg_admin_password != ''
|
||||
when:
|
||||
- pg_hostname is not defined or pg_hostname == ''
|
||||
|
@ -3,7 +3,9 @@ DATABASE_NAME={{ pg_database }}
|
||||
DATABASE_HOST={{ pg_hostname|default('postgresql') }}
|
||||
DATABASE_PORT={{ pg_port|default('5432') }}
|
||||
DATABASE_PASSWORD={{ pg_password | quote }}
|
||||
DATABASE_ADMIN_PASSWORD={{ pg_admin_password | quote }}
|
||||
{% if pg_admin_password is defined %}
|
||||
DATABASE_ADMIN_PASSWORD={{ pg_admin_password|quote }}
|
||||
{% endif %}
|
||||
MEMCACHED_HOST={{ memcached_hostname|default('localhost') }}
|
||||
MEMCACHED_PORT={{ memcached_port|default('11211') }}
|
||||
RABBITMQ_HOST={{ rabbitmq_hostname|default('localhost') }}
|
||||
|
@ -3,7 +3,9 @@ DATABASE_NAME={{ pg_database|quote }}
|
||||
DATABASE_HOST={{ pg_hostname|default('postgres')|quote }}
|
||||
DATABASE_PORT={{ pg_port|default('5432')|quote }}
|
||||
DATABASE_PASSWORD={{ pg_password|default('awxpass')|quote }}
|
||||
DATABASE_ADMIN_PASSWORD={{ pg_admin_password|default('postgrespass')|quote }}
|
||||
{% if pg_admin_password is defined %}
|
||||
DATABASE_ADMIN_PASSWORD={{ pg_admin_password|quote }}
|
||||
{% endif %}
|
||||
MEMCACHED_HOST={{ memcached_hostname|default('memcached') }}
|
||||
MEMCACHED_PORT={{ memcached_port|default('11211')|quote }}
|
||||
RABBITMQ_HOST={{ rabbitmq_hostname|default('rabbitmq')|quote }}
|
||||
|
Loading…
Reference in New Issue
Block a user