diff options
| author | Jeff Cantrill <jcantril@redhat.com> | 2017-08-25 09:00:10 -0400 |
|---|---|---|
| committer | Jeff Cantrill <jcantril@redhat.com> | 2017-08-28 15:20:35 -0400 |
| commit | f14ec41fc954e2f1e2d5ec0505d6198f768926a0 (patch) | |
| tree | cd19b4c8003febeba95e1b876706dfe6d207b922 /roles | |
| parent | 2b07b98262d7bacdb52fc08c0108c4c4b113ff5c (diff) | |
| download | openshift-f14ec41fc954e2f1e2d5ec0505d6198f768926a0.tar.gz openshift-f14ec41fc954e2f1e2d5ec0505d6198f768926a0.tar.bz2 openshift-f14ec41fc954e2f1e2d5ec0505d6198f768926a0.tar.xz openshift-f14ec41fc954e2f1e2d5ec0505d6198f768926a0.zip | |
annotate the infra projects for logging to fix bz1480988
Diffstat (limited to 'roles')
| -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 d4a305fb8..654a7ce3e 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -220,6 +220,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'] |