External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

fixed ingress template

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
installer/roles/kubernetes/tasks/main.yml
View File

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

6
installer/roles/kubernetes/templates/deployment.yml.j2
View File

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