diff --git a/installer/inventory b/installer/inventory index c9e8ce612d..b25cd5d44e 100644 --- a/installer/inventory +++ b/installer/inventory @@ -20,6 +20,7 @@ dockerhub_version=latest # Kubernetes Install # kubernetes_context=test-cluster # kubernetes_namespace=awx +# tiller_namespace=kube-system # Kubernetes and Openshift Install Resource Requests # This is the request value for a pod's "task" container, which is the container diff --git a/installer/roles/kubernetes/defaults/main.yml b/installer/roles/kubernetes/defaults/main.yml index a5fd1d82bb..fae302f780 100644 --- a/installer/roles/kubernetes/defaults/main.yml +++ b/installer/roles/kubernetes/defaults/main.yml @@ -24,3 +24,5 @@ openshift_pg_emptydir: no openshift_pg_pvc_name: postgresql kubernetes_deployment_name: awx + +tiller_namespace: kube-system diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml index da66f027f9..4cec23ad4e 100644 --- a/installer/roles/kubernetes/tasks/main.yml +++ b/installer/roles/kubernetes/tasks/main.yml @@ -51,6 +51,7 @@ - name: Deploy and Activate Postgres (Kubernetes) shell: | helm install --name {{ kubernetes_deployment_name }} --namespace {{ kubernetes_namespace }} \ + --tiller-namespace {{ tiller_namespace }} \ --set postgresUser={{ pg_username }} \ --set postgresPassword={{ pg_password }} \ --set postgresDatabase={{ pg_database }} \