diff options
| author | Erik Berg <ansible@slipsprogrammor.no> | 2019-11-18 14:46:43 +0100 |
|---|---|---|
| committer | Erik Berg <ansible@slipsprogrammor.no> | 2019-11-18 14:46:43 +0100 |
| commit | 91c78d71377fd161843189cf0395cfcd63835d0a (patch) | |
| tree | e168fe691eb473bb3a2c03cd6ca5ebb2cf7d2743 /installer/roles | |
| parent | Merge pull request #5325 from AlanCoding/inputs_inputs (diff) | |
| download | awx-91c78d71377fd161843189cf0395cfcd63835d0a.tar.xz awx-91c78d71377fd161843189cf0395cfcd63835d0a.zip | |
Consistent naming scheme; rabbitmq_host -> rabbitmq_hostname
environment.sh uses hostname for everything, and both environment and
credentials provide a default of 'rabbitmq', so this should be one less
variable to care about.
Diffstat (limited to 'installer/roles')
| -rw-r--r-- | installer/roles/local_docker/defaults/main.yml | 2 | ||||
| -rw-r--r-- | installer/roles/local_docker/templates/credentials.py.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/installer/roles/local_docker/defaults/main.yml b/installer/roles/local_docker/defaults/main.yml index 86bc710cb4..ede07f1f94 100644 --- a/installer/roles/local_docker/defaults/main.yml +++ b/installer/roles/local_docker/defaults/main.yml @@ -5,7 +5,7 @@ rabbitmq_version: "3.7.4" rabbitmq_image: "ansible/awx_rabbitmq:{{rabbitmq_version}}" rabbitmq_default_vhost: "awx" rabbitmq_erlang_cookie: "cookiemonster" -rabbitmq_host: "rabbitmq" +rabbitmq_hostname: "rabbitmq" rabbitmq_port: "5672" rabbitmq_user: "guest" rabbitmq_password: "guest" diff --git a/installer/roles/local_docker/templates/credentials.py.j2 b/installer/roles/local_docker/templates/credentials.py.j2 index 04f4031608..7e8e4cbb0a 100644 --- a/installer/roles/local_docker/templates/credentials.py.j2 +++ b/installer/roles/local_docker/templates/credentials.py.j2 @@ -13,7 +13,7 @@ DATABASES = { BROKER_URL = 'amqp://{}:{}@{}:{}/{}'.format( "{{ rabbitmq_user }}", "{{ rabbitmq_password }}", - "{{ rabbitmq_host | default('rabbitmq')}}", + "{{ rabbitmq_hostname | default('rabbitmq')}}", "{{ rabbitmq_port }}", "{{ rabbitmq_default_vhost }}") |