From 3c586308f6abe4451b022833291068900fe102fb Mon Sep 17 00:00:00 2001 From: Jeff Cantrill Date: Fri, 10 Mar 2017 15:18:12 -0500 Subject: bug 1430661. Update masterConfig metricsPublicURL on install --- roles/openshift_metrics/tasks/install_metrics.yaml | 2 ++ roles/openshift_metrics/tasks/update_master_config.yaml | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 roles/openshift_metrics/tasks/update_master_config.yaml (limited to 'roles/openshift_metrics/tasks') diff --git a/roles/openshift_metrics/tasks/install_metrics.yaml b/roles/openshift_metrics/tasks/install_metrics.yaml index 66a3abdbd..ffe6f63a2 100644 --- a/roles/openshift_metrics/tasks/install_metrics.yaml +++ b/roles/openshift_metrics/tasks/install_metrics.yaml @@ -34,6 +34,8 @@ file_content: "{{ item.content | b64decode | from_yaml }}" with_items: "{{ object_defs.results }}" +- include: update_master_config.yaml + - command: > {{openshift.common.client_binary}} --config={{mktemp.stdout}}/admin.kubeconfig diff --git a/roles/openshift_metrics/tasks/update_master_config.yaml b/roles/openshift_metrics/tasks/update_master_config.yaml new file mode 100644 index 000000000..93054b99b --- /dev/null +++ b/roles/openshift_metrics/tasks/update_master_config.yaml @@ -0,0 +1,9 @@ +--- +- name: Adding metrics route information to metricsPublicURL + modify_yaml: + dest: "{{ openshift.common.config_base }}/master/master-config.yaml" + yaml_key: assetConfig.metricsPublicURL + yaml_value: "https://{{ openshift_metrics_hawkular_hostname}}" + notify: restart master + tags: + - update_master_config -- cgit v1.2.3 From b70ccecac5ee1593754d4034c23feb58302e2bde Mon Sep 17 00:00:00 2001 From: Jeff Cantrill Date: Fri, 10 Mar 2017 15:49:43 -0500 Subject: add 'hawkular/metrics' when updating config --- roles/openshift_metrics/tasks/update_master_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/openshift_metrics/tasks') diff --git a/roles/openshift_metrics/tasks/update_master_config.yaml b/roles/openshift_metrics/tasks/update_master_config.yaml index 93054b99b..20fc45fd4 100644 --- a/roles/openshift_metrics/tasks/update_master_config.yaml +++ b/roles/openshift_metrics/tasks/update_master_config.yaml @@ -3,7 +3,7 @@ modify_yaml: dest: "{{ openshift.common.config_base }}/master/master-config.yaml" yaml_key: assetConfig.metricsPublicURL - yaml_value: "https://{{ openshift_metrics_hawkular_hostname}}" + yaml_value: "https://{{ openshift_metrics_hawkular_hostname}}/hawkular/metrics" notify: restart master tags: - update_master_config -- cgit v1.2.3