External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 18:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

#2039 add tiller-namespace as argument

Browse Source
This commit is contained in:
Marcin Karkocha
2018-07-02 12:33:26 +00:00
parent 2e980293d9
commit a19df9b3b3
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
installer/inventory
View File

@@ -20,6 +20,7 @@ dockerhub_version=latest
# Kubernetes Install # Kubernetes Install
# kubernetes_context=test-cluster # kubernetes_context=test-cluster
# kubernetes_namespace=awx # kubernetes_namespace=awx
# tiller_namespace=kube-system
# Kubernetes and Openshift Install Resource Requests # Kubernetes and Openshift Install Resource Requests
# This is the request value for a pod's "task" container, which is the container # This is the request value for a pod's "task" container, which is the container

2
installer/roles/kubernetes/defaults/main.yml
View File

@@ -24,3 +24,5 @@ openshift_pg_emptydir: no
openshift_pg_pvc_name: postgresql openshift_pg_pvc_name: postgresql
kubernetes_deployment_name: awx kubernetes_deployment_name: awx
tiller_namespace: kube-system

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

@@ -51,6 +51,7 @@
- name: Deploy and Activate Postgres (Kubernetes) - name: Deploy and Activate Postgres (Kubernetes)
shell: | shell: |
helm install --name {{ kubernetes_deployment_name }} --namespace {{ kubernetes_namespace }} \ helm install --name {{ kubernetes_deployment_name }} --namespace {{ kubernetes_namespace }} \
--tiller-namespace {{ tiller_namespace }} \
--set postgresUser={{ pg_username }} \ --set postgresUser={{ pg_username }} \
--set postgresPassword={{ pg_password }} \ --set postgresPassword={{ pg_password }} \
--set postgresDatabase={{ pg_database }} \ --set postgresDatabase={{ pg_database }} \