From 94fa4deab3873a462fdf7aa0be1c8b543a569172 Mon Sep 17 00:00:00 2001 From: Christian Adams Date: Thu, 21 Nov 2019 11:12:05 -0500 Subject: [PATCH] Set default values for analytics settings --- installer/roles/kubernetes/defaults/main.yml | 2 ++ installer/roles/kubernetes/templates/configmap.yml.j2 | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/installer/roles/kubernetes/defaults/main.yml b/installer/roles/kubernetes/defaults/main.yml index fb5c316bff..95612d7f35 100644 --- a/installer/roles/kubernetes/defaults/main.yml +++ b/installer/roles/kubernetes/defaults/main.yml @@ -48,6 +48,8 @@ postgress_activate_wait: 60 restore_backup_file: "./tower-openshift-backup-latest.tar.gz" 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_python: "python2" diff --git a/installer/roles/kubernetes/templates/configmap.yml.j2 b/installer/roles/kubernetes/templates/configmap.yml.j2 index 83efee4f68..68206a5ccf 100644 --- a/installer/roles/kubernetes/templates/configmap.yml.j2 +++ b/installer/roles/kubernetes/templates/configmap.yml.j2 @@ -138,8 +138,8 @@ data: SYSTEM_TASK_ABS_MEM = {{ ((task_mem_request|int * 1024) / 100)|int }} INSIGHTS_URL_BASE = "{{ insights_url_base }}" - INSIGHTS_AGENT_MIME = "application/vnd.redhat.tower.analytics+tgz" - AUTOMATION_ANALYTICS_URL = 'https://cloud.redhat.com/api/ingress/v1/upload' + INSIGHTS_AGENT_MIME = "{{ insights_agent_mime }}" + AUTOMATION_ANALYTICS_URL = "{{ automation_analytics_url }}" #Autoprovisioning should replace this CLUSTER_HOST_ID = socket.gethostname()