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_logging | |
| 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_logging')
| -rw-r--r-- | roles/openshift_logging/tasks/delete_logging.yaml | 11 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 12 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/update_master_config.yaml | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/delete_logging.yaml b/roles/openshift_logging/tasks/delete_logging.yaml index b1ceade88..fbc3e3fd1 100644 --- a/roles/openshift_logging/tasks/delete_logging.yaml +++ b/roles/openshift_logging/tasks/delete_logging.yaml @@ -130,3 +130,14 @@ name: openshift_logging_eventrouter when: not openshift_logging_install_eventrouter | default(false) | bool + +# Update asset config in openshift-web-console namespace +- name: Remove Kibana route information from web console asset config + include_role: + name: openshift_web_console + tasks_from: update_asset_config.yml + vars: + asset_config_edits: + - key: loggingPublicURL + value: "" + when: openshift_web_console_install | default(true) | bool diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index 6aae251c1..185f47f50 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -314,4 +314,16 @@ openshift_logging_install_eventrouter | default(false) | 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 Kibana route information to web console asset config + include_role: + name: openshift_web_console + tasks_from: update_asset_config.yml + vars: + asset_config_edits: + - key: loggingPublicURL + value: "https://{{ openshift_logging_kibana_hostname }}" + when: openshift_web_console_install | default(true) | bool diff --git a/roles/openshift_logging/tasks/update_master_config.yaml b/roles/openshift_logging/tasks/update_master_config.yaml index b96b8e29d..c0f42ba97 100644 --- a/roles/openshift_logging/tasks/update_master_config.yaml +++ b/roles/openshift_logging/tasks/update_master_config.yaml @@ -1,4 +1,5 @@ --- +# TODO: Remove when asset config is removed from master-config.yaml - name: Adding Kibana route information to loggingPublicURL modify_yaml: dest: "{{ openshift.common.config_base }}/master/master-config.yaml" |