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

* adds persistence.storageClass and limits to postgress helm install

Browse Source 
* adds new variables to the inventory

Signed-off-by: Corey Wanless <corey.wanless@wwt.com>
This commit is contained in:
Corey Wanless
2019-01-11 19:54:05 -06:00
parent e3872ebd58
commit 0c074e0988
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
installer/inventory
View File

@@ -21,6 +21,10 @@ dockerhub_base=ansible
# kubernetes_context=test-cluster # kubernetes_context=test-cluster
# kubernetes_namespace=awx # kubernetes_namespace=awx
# tiller_namespace=kube-system # tiller_namespace=kube-system
# Optional Kubernetes Variables
# pg_persistence_storageClass=StorageClassName
# pg_cpu_limit=1000
# pg_mem_limit=2
# 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

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

@@ -86,6 +86,9 @@
--set postgresqlDatabase={{ pg_database }} \ --set postgresqlDatabase={{ pg_database }} \
--set persistence.size={{ pg_volume_capacity|default('5')}}Gi \ --set persistence.size={{ pg_volume_capacity|default('5')}}Gi \
--tiller-namespace={{ tiller_namespace | default('kube-system') }} \ --tiller-namespace={{ tiller_namespace | default('kube-system') }} \
{{ '--set persistence.storageClass='+pg_persistence_storageClass if pg_persistence_storageClass is defined else ' ' }} \
{{ '--set resources.limits.cpu='+(pg_cpu_limit | string)+'m' if pg_cpu_limit is defined else ' ' }} \
{{ '--set resources.limits.memory='+(pg_mem_limit | string)+'Gi' if pg_mem_limit is defined else ' ' }} \
stable/postgresql stable/postgresql
when: when:
- pg_hostname is not defined or pg_hostname == '' - pg_hostname is not defined or pg_hostname == ''