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

merge and resolve conflicts

Browse Source
This commit is contained in:
mosad
2020-06-10 16:01:17 +02:00
parent 0bfcacfcf4 442d539ff8
commit eb5970b4a1
60 changed files with 886 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,15 +38,6 @@ kubernetes_redis_image: "redis"
kubernetes_redis_image_tag: "latest"
kubernetes_redis_config_mount_path: "/usr/local/etc/redis/redis.conf"
memcached_mem_request: 1
memcached_cpu_request: 500
memcached_security_context_enabled: true
memcached_security_context_privileged: false
memcached_security_context_user: 1001
kubernetes_memcached_version: "latest"
kubernetes_memcached_image: "memcached"
openshift_pg_emptydir: false
openshift_pg_pvc_name: postgresql