1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-30 22:21:13 +03:00

Merge pull request #2392 from shanemcd/devel

Port downstream installer changes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2018-10-09 19:18:24 +00:00 committed by GitHub
commit 6baa2a109d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 39 deletions

View File

@ -1,13 +1,11 @@
---
dockerhub_version: "{{ lookup('file', playbook_dir + '/../VERSION') }}"
admin_user: 'admin'
admin_email: 'root@localhost'
admin_password: 'password'
admin_password: ''
rabbitmq_user: 'awx'
rabbitmq_password: 'password'
rabbitmq_erlang_cookie: 'cookiemonster'
rabbitmq_password: ''
rabbitmq_erlang_cookie: ''
kubernetes_base_path: "{{ local_base_config_path|default('/tmp') }}/{{ kubernetes_deployment_name }}-config"

View File

@ -33,6 +33,7 @@
register: result
until: result.stdout == "Running"
retries: 60
delay: 10
- name: Create directory for backup
file:

View File

@ -24,7 +24,7 @@
kubectl_or_oc: "{{ openshift_oc_bin if openshift_oc_bin is defined else 'kubectl' }}"
- set_fact:
deployment_object: "{{ 'dc' if openshift_host is defined else 'deployment' }}"
deployment_object: "sts"
- name: Record deployment size
shell: |
@ -156,6 +156,7 @@
register: result
until: result.stdout == "Running"
retries: 60
delay: 10
- name: Migrate database
shell: |

View File

@ -26,7 +26,7 @@
extra_opts: [--strip-components=1]
- set_fact:
deployment_object: "{{ 'dc' if openshift_host is defined else 'deployment' }}"
deployment_object: "sts"
- name: Record deployment size
shell: |
@ -70,6 +70,7 @@
register: result
until: result.stdout == "Running"
retries: 60
delay: 10
- name: Temporarily grant createdb role
shell: |
@ -79,7 +80,7 @@
--host={{ pg_hostname | default('postgresql') }} \
--port={{ pg_port | default('5432') }} \
--username=postgres \
--dbname=template1 -c 'ALTER USER tower CREATEDB;'"
--dbname=template1 -c 'ALTER USER {{ pg_username }} CREATEDB;'"
no_log: true
when: pg_hostname is not defined or pg_hostname == ''
@ -102,7 +103,7 @@
--host={{ pg_hostname | default('postgresql') }} \
--port={{ pg_port | default('5432') }} \
--username=postgres \
--dbname=template1 -c 'ALTER USER tower NOCREATEDB;'"
--dbname=template1 -c 'ALTER USER {{ pg_username }} NOCREATEDB;'"
no_log: true
when: pg_hostname is not defined or pg_hostname == ''

View File

@ -12,7 +12,7 @@ metadata:
namespace: {{ kubernetes_namespace }}
name: rabbitmq
labels:
app: rabbitmq
app: {{ kubernetes_deployment_name }}
type: LoadBalancer
spec:
type: NodePort
@ -26,7 +26,7 @@ spec:
port: 5672
targetPort: 5672
selector:
app: rabbitmq
app: {{ kubernetes_deployment_name }}
---
apiVersion: v1
@ -109,13 +109,8 @@ userNames:
{% endif %}
---
{% if openshift_host is defined %}
apiVersion: v1
kind: DeploymentConfig
{% else %}
apiVersion: extensions/v1beta1
kind: Deployment
{% endif %}
apiVersion: apps/v1beta1
kind: StatefulSet
metadata:
name: {{ kubernetes_deployment_name }}
namespace: {{ kubernetes_namespace }}
@ -126,31 +121,14 @@ spec:
labels:
name: {{ kubernetes_deployment_name }}-web-deploy
service: django
app: rabbitmq
app: {{ kubernetes_deployment_name }}
spec:
serviceAccountName: awx
terminationGracePeriodSeconds: 10
containers:
- name: {{ kubernetes_deployment_name }}-web
image: "{{ kubernetes_web_image }}:{{ kubernetes_web_version }}"
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
valueFrom:
secretKeyRef:
name: "{{ kubernetes_deployment_name }}-secrets"
key: pg_password
- name: MEMCACHED_HOST
value: {{ memcached_hostname|default('localhost') }}
- name: RABBITMQ_HOST
value: {{ rabbitmq_hostname|default('localhost') }}
ports:
- containerPort: 8052
volumeMounts:
@ -341,7 +319,7 @@ spec:
port:
targetPort: http
tls:
insecureEdgeTerminationPolicy: Allow
insecureEdgeTerminationPolicy: Redirect
termination: edge
to:
kind: Service

View File

@ -7,7 +7,7 @@ metadata:
spec:
containers:
- name: ansible-tower-management
image: {{ kubernetes_task_image }}
image: "{{ kubernetes_task_image }}:{{ kubernetes_task_version }}"
command: ["sleep", "infinity"]
volumeMounts:
- name: {{ kubernetes_deployment_name }}-application-config