Python 3 / Upstream Kubernetes

This commit is contained in:
Shane McDonald
2019-01-14 17:33:01 -05:00
committed by Ryan Petrello
parent 2016798e0f
commit 04da4503db
6 changed files with 16 additions and 8 deletions

View File

@@ -13,10 +13,10 @@ rabbitmq_erlang_cookie: ''
kubernetes_base_path: "{{ local_base_config_path|default('/tmp') }}/{{ kubernetes_deployment_name }}-config"
kubernetes_task_version: "{{ tower_package_version | default(dockerhub_version) }}"
kubernetes_task_image: "{{ tower_package_name | default(dockerhub_base+'/awx_task') }}"
kubernetes_task_image: "{{ tower_package_name | default('ansible/awx_task') }}"
kubernetes_web_version: "{{ tower_package_version | default(dockerhub_version) }}"
kubernetes_web_image: "{{ tower_package_name | default(dockerhub_base+'/awx_web') }}"
kubernetes_web_image: "{{ tower_package_name | default('ansible/awx_web') }}"
web_mem_request: 1
web_cpu_request: 500
@@ -44,3 +44,5 @@ kubernetes_deployment_name: awx
kubernetes_deployment_replica_size: 1
postgress_activate_wait: 60
insights_url_base: "https://example.org"

View File

@@ -18,6 +18,8 @@ data:
SYSTEM_TASK_ABS_CPU = {{ ((task_cpu_request|int / 1000) * 4)|int }}
SYSTEM_TASK_ABS_MEM = {{ ((task_mem_request|int * 1024) / 100)|int }}
INSIGHTS_URL_BASE = "{{ insights_url_base }}"
#Autoprovisioning should replace this
CLUSTER_HOST_ID = socket.gethostname()
SYSTEM_UUID = '00000000-0000-0000-0000-000000000000'
@@ -30,7 +32,7 @@ data:
STATIC_ROOT = '/var/lib/awx/public/static'
PROJECTS_ROOT = '/var/lib/awx/projects'
JOBOUTPUT_ROOT = '/var/lib/awx/job_status'
SECRET_KEY = file('/etc/tower/SECRET_KEY', 'rb').read().strip()
SECRET_KEY = open('/etc/tower/SECRET_KEY', 'rb').read().strip()
ALLOWED_HOSTS = ['*']
INTERNAL_API_URL = 'http://127.0.0.1:8052'
SERVER_EMAIL = 'root@localhost'