fixed ingress template

This commit is contained in:
Vyacheslav Andreykiv (Intel) 2020-04-27 14:33:42 -07:00
parent c2e9df74e4
commit 7659ffca1e
2 changed files with 10 additions and 8 deletions

View File

@ -64,7 +64,7 @@
template:
src: postgresql-persistent.yml.j2
dest: "{{ kubernetes_base_path }}/postgresql-persistent.yml"
mode: '0600'
mode: "0600"
- name: Deploy and Activate Postgres (OpenShift)
shell: |
@ -209,11 +209,11 @@
set_fact:
"{{ item }}": "{{ lookup('template', item + '.yml.j2') }}"
with_items:
- 'configmap'
- 'secret'
- 'deployment'
- 'supervisor'
- 'launch_awx'
- "configmap"
- "secret"
- "deployment"
- "supervisor"
- "launch_awx"
no_log: true
- name: Apply Deployment

View File

@ -136,7 +136,7 @@ spec:
- name: {{ kubernetes_deployment_name }}-launch-awx-task
mountPath: "/usr/bin/launch_awx_task.sh"
subPath: "launch_awx_task.sh"
readOnly: true
readOnly: true
- name: {{ kubernetes_deployment_name }}-supervisor-web-config
mountPath: "/supervisor.conf"
@ -212,7 +212,7 @@ spec:
- name: {{ kubernetes_deployment_name }}-launch-awx-task
mountPath: "/usr/bin/launch_awx_task.sh"
subPath: "launch_awx_task.sh"
readOnly: true
readOnly: true
- name: {{ kubernetes_deployment_name }}-supervisor-web-config
mountPath: "/supervisor.conf"
@ -447,8 +447,10 @@ metadata:
{% for key, value in kubernetes_ingress_annotations.items() %}
{{ key }}: {{ value }}
{% endfor %}
{% endif %}
spec:
{% if kubernetes_ingress_hostname is defined %}
{% if kubernetes_ingress_tls_secret is defined %}
tls:
- hosts: