diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-29 16:46:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 16:46:41 -0400 |
| commit | 0fd6d3108977e5c1bfffacbda84b3d066787d2e8 (patch) | |
| tree | cf263b523ffb43ef0faf53ad4951fe35541766a2 | |
| parent | 248f75d2b3774f7fb912768ed453a32855ec8218 (diff) | |
| parent | f14ec41fc954e2f1e2d5ec0505d6198f768926a0 (diff) | |
| download | openshift-0fd6d3108977e5c1bfffacbda84b3d066787d2e8.tar.gz openshift-0fd6d3108977e5c1bfffacbda84b3d066787d2e8.tar.bz2 openshift-0fd6d3108977e5c1bfffacbda84b3d066787d2e8.tar.xz openshift-0fd6d3108977e5c1bfffacbda84b3d066787d2e8.zip | |
Merge pull request #5219 from jcantrill/bz1480988_kibana_ops_links
annotate the infra projects for logging to fix bz1480988
| -rw-r--r-- | roles/openshift_logging/tasks/annotate_ops_projects.yaml | 17 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 1 | ||||
| -rw-r--r-- | roles/openshift_logging/vars/main.yaml | 2 |
3 files changed, 20 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/annotate_ops_projects.yaml b/roles/openshift_logging/tasks/annotate_ops_projects.yaml new file mode 100644 index 000000000..d4b33616a --- /dev/null +++ b/roles/openshift_logging/tasks/annotate_ops_projects.yaml @@ -0,0 +1,17 @@ +--- +- oc_obj: + state: list + kind: project + name: "{{ item }}" + with_items: "{{ __default_logging_ops_projects }}" + register: __logging_ops_projects + +- name: Annotate Operations Projects + oc_edit: + kind: ns + name: "{{ item.item }}" + separator: '#' + content: + metadata#annotations#openshift.io/logging.ui.hostname: "{{ openshift_logging_kibana_ops_hostname }}" + with_items: "{{ __logging_ops_projects.results }}" + when: "{{ item.results.stderr is not defined }}" diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index f8553be79..a77df9986 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -216,6 +216,7 @@ when: - openshift_logging_use_ops | bool +- include: annotate_ops_projects.yaml ## Curator - include_role: diff --git a/roles/openshift_logging/vars/main.yaml b/roles/openshift_logging/vars/main.yaml index e561b41e2..01809fddf 100644 --- a/roles/openshift_logging/vars/main.yaml +++ b/roles/openshift_logging/vars/main.yaml @@ -6,3 +6,5 @@ es_ops_node_quorum: "{{ (openshift_logging_es_ops_cluster_size | int/2 | round(0 es_ops_recover_expected_nodes: "{{openshift_logging_es_ops_cluster_size | int}}" es_log_appenders: ['file', 'console'] + +__default_logging_ops_projects: ['default', 'openshift', 'openshift-infra', 'kube-system'] |