diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-11 10:04:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-11 10:04:27 -0500 |
| commit | 608b6debb28d9b477d21cd78f01d0bfbcd04cd01 (patch) | |
| tree | f7541e860427a1fc21b16c1f78daa25d838d13a3 /roles | |
| parent | 15100f21a5b60271223d32b41de986ff6c0b3e0f (diff) | |
| parent | b70ccecac5ee1593754d4034c23feb58302e2bde (diff) | |
| download | openshift-608b6debb28d9b477d21cd78f01d0bfbcd04cd01.tar.gz openshift-608b6debb28d9b477d21cd78f01d0bfbcd04cd01.tar.bz2 openshift-608b6debb28d9b477d21cd78f01d0bfbcd04cd01.tar.xz openshift-608b6debb28d9b477d21cd78f01d0bfbcd04cd01.zip | |
Merge pull request #3625 from jcantrill/bz1430661_update_metrics_url
Merged by openshift-bot
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_metrics/handlers/main.yml | 26 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/install_metrics.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/update_master_config.yaml | 9 |
3 files changed, 37 insertions, 0 deletions
diff --git a/roles/openshift_metrics/handlers/main.yml b/roles/openshift_metrics/handlers/main.yml new file mode 100644 index 000000000..ffb812271 --- /dev/null +++ b/roles/openshift_metrics/handlers/main.yml @@ -0,0 +1,26 @@ +--- +- name: restart master + systemd: name={{ openshift.common.service_type }}-master state=restarted + when: (openshift.master.ha is not defined or not openshift.master.ha | bool) and (not (master_service_status_changed | default(false) | bool)) + notify: Verify API Server + +- name: Verify API Server + # Using curl here since the uri module requires python-httplib2 and + # wait_for port doesn't provide health information. + command: > + curl --silent --tlsv1.2 + {% if openshift.common.version_gte_3_2_or_1_2 | bool %} + --cacert {{ openshift.common.config_base }}/master/ca-bundle.crt + {% else %} + --cacert {{ openshift.common.config_base }}/master/ca.crt + {% endif %} + {{ openshift.master.api_url }}/healthz/ready + args: + # Disables the following warning: + # Consider using get_url or uri module rather than running curl + warn: no + register: api_available_output + until: api_available_output.stdout == 'ok' + retries: 120 + delay: 1 + changed_when: false 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..20fc45fd4 --- /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}}/hawkular/metrics" + notify: restart master + tags: + - update_master_config |