diff options
| author | Matthew Jones <bsdmatburt@gmail.com> | 2018-08-13 19:27:00 +0200 |
|---|---|---|
| committer | Matthew Jones <bsdmatburt@gmail.com> | 2018-08-13 19:27:00 +0200 |
| commit | 4dcd379d1e141cbb57d5b30230ddd66462041ee9 (patch) | |
| tree | f59926a8505cf3681db570d69d76ec39d54c7026 | |
| parent | fix failing tests related to 2c4f7911a62af804efc807e496a2d8500760c597 (diff) | |
| download | awx-4dcd379d1e141cbb57d5b30230ddd66462041ee9.tar.xz awx-4dcd379d1e141cbb57d5b30230ddd66462041ee9.zip | |
Add some env variables to the web deployment
This allows the start script to properly wait on services to come
online rather than getting stuck and waiting for the full timeout
| -rw-r--r-- | installer/roles/kubernetes/templates/deployment.yml.j2 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2 index 4234a62ca3..7387b5e8d1 100644 --- a/installer/roles/kubernetes/templates/deployment.yml.j2 +++ b/installer/roles/kubernetes/templates/deployment.yml.j2 @@ -133,6 +133,21 @@ spec: - name: {{ kubernetes_deployment_name }}-web image: {{ kubernetes_web_image | default(dockerhub_web_image) }} imagePullPolicy: Always + env: + - name: DATABASE_USER + value: {{ pg_username }} + - name: DATABASE_NAME + value: {{ pg_database }} + - name: DATABASE_HOST + value: {{ pg_hostname|default('postgresql') }} + - name: DATABASE_PORT + value: "{{ pg_port|default('5432') }}" + - name: DATABASE_PASSWORD + value: {{ pg_password }} + - name: MEMCACHED_HOST + value: {{ memcached_hostname|default('localhost') }} + - name: RABBITMQ_HOST + value: {{ rabbitmq_hostname|default('localhost') }} ports: - containerPort: 8052 volumeMounts: |