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

Merge pull request #5373 from rooftopcellist/rm_analytics_values

Browse Source 
Set default values for analytics settings

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-11-21 18:21:40 +00:00
committed by GitHub
parent 53aadd3b96 94fa4deab3
commit c4143b0111
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,8 @@ postgress_activate_wait: 60
restore_backup_file: "./tower-openshift-backup-latest.tar.gz" restore_backup_file: "./tower-openshift-backup-latest.tar.gz"
insights_url_base: "https://example.org" insights_url_base: "https://example.org"
automation_analytics_url: "https://example.org"
insights_agent_mime: "application/example"
custom_venvs_path: "/opt/custom-venvs" custom_venvs_path: "/opt/custom-venvs"
custom_venvs_python: "python2" custom_venvs_python: "python2"

4
installer/roles/kubernetes/templates/configmap.yml.j2
View File

@@ -138,8 +138,8 @@ data:
SYSTEM_TASK_ABS_MEM = {{ ((task_mem_request|int * 1024) / 100)|int }} SYSTEM_TASK_ABS_MEM = {{ ((task_mem_request|int * 1024) / 100)|int }}
INSIGHTS_URL_BASE = "{{ insights_url_base }}" INSIGHTS_URL_BASE = "{{ insights_url_base }}"
INSIGHTS_AGENT_MIME = "application/vnd.redhat.tower.analytics+tgz" INSIGHTS_AGENT_MIME = "{{ insights_agent_mime }}"
AUTOMATION_ANALYTICS_URL = 'https://cloud.redhat.com/api/ingress/v1/upload' AUTOMATION_ANALYTICS_URL = "{{ automation_analytics_url }}"
#Autoprovisioning should replace this #Autoprovisioning should replace this
CLUSTER_HOST_ID = socket.gethostname() CLUSTER_HOST_ID = socket.gethostname()