diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-06 12:17:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 12:17:40 -0500 |
| commit | a5eee09d02120bb16d7f81d1b05982e1a69df4dc (patch) | |
| tree | b8939099e2b6ee0ce12a41c8d9456121994b6c6b /roles/openshift_metrics | |
| parent | c0e349bebcfbec0c2424c91f60727910e48b0fac (diff) | |
| parent | 296ee5ee346c843eb69786e1ab997e72870839ff (diff) | |
| download | openshift-a5eee09d02120bb16d7f81d1b05982e1a69df4dc.tar.gz openshift-a5eee09d02120bb16d7f81d1b05982e1a69df4dc.tar.bz2 openshift-a5eee09d02120bb16d7f81d1b05982e1a69df4dc.tar.xz openshift-a5eee09d02120bb16d7f81d1b05982e1a69df4dc.zip | |
Merge pull request #6359 from spadgett/web-console-server
Install web console server
Diffstat (limited to 'roles/openshift_metrics')
| -rw-r--r-- | roles/openshift_metrics/tasks/install_metrics.yaml | 12 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/uninstall_metrics.yaml | 11 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/update_master_config.yaml | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/roles/openshift_metrics/tasks/install_metrics.yaml b/roles/openshift_metrics/tasks/install_metrics.yaml index 106909941..0866fe0d2 100644 --- a/roles/openshift_metrics/tasks/install_metrics.yaml +++ b/roles/openshift_metrics/tasks/install_metrics.yaml @@ -67,8 +67,20 @@ with_items: "{{ hawkular_agent_object_defs.results }}" when: openshift_metrics_install_hawkular_agent | bool +# TODO: Remove when asset config is removed from master-config.yaml - include_tasks: update_master_config.yaml +# Update asset config in openshift-web-console namespace +- name: Add metrics route information to web console asset config + include_role: + name: openshift_web_console + tasks_from: update_asset_config.yml + vars: + asset_config_edits: + - key: metricsPublicURL + value: "https://{{ openshift_metrics_hawkular_hostname}}/hawkular/metrics" + when: openshift_web_console_install | default(true) | bool + - command: > {{openshift_client_binary}} --config={{mktemp.stdout}}/admin.kubeconfig diff --git a/roles/openshift_metrics/tasks/uninstall_metrics.yaml b/roles/openshift_metrics/tasks/uninstall_metrics.yaml index 0ab0eec4b..610c7b4e5 100644 --- a/roles/openshift_metrics/tasks/uninstall_metrics.yaml +++ b/roles/openshift_metrics/tasks/uninstall_metrics.yaml @@ -18,3 +18,14 @@ clusterrolebinding/heapster-cluster-reader clusterrolebinding/hawkular-metrics changed_when: delete_metrics.stdout != 'No resources found' + +# Update asset config in openshift-web-console namespace +- name: Remove metrics route information from web console asset config + include_role: + name: openshift_web_console + tasks_from: update_asset_config.yml + vars: + asset_config_edits: + - key: metricsPublicURL + value: "" + when: openshift_web_console_install | default(true) | bool diff --git a/roles/openshift_metrics/tasks/update_master_config.yaml b/roles/openshift_metrics/tasks/update_master_config.yaml index 5059d8d94..6567fcb4f 100644 --- a/roles/openshift_metrics/tasks/update_master_config.yaml +++ b/roles/openshift_metrics/tasks/update_master_config.yaml @@ -1,4 +1,5 @@ --- +# TODO: Remove when asset config is removed from master-config.yaml - name: Adding metrics route information to metricsPublicURL modify_yaml: dest: "{{ openshift.common.config_base }}/master/master-config.yaml" |