diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-30 11:00:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-30 11:00:28 -0400 |
| commit | e5afeee8e1cfd6b344aac84d95bdf8b66e775bdd (patch) | |
| tree | e2544f710452a11c68833ad02b276eb21e39c642 | |
| parent | ca089c724a7a44efa6abb88313a461f9f7cda122 (diff) | |
| parent | 19ba6418249c59feebec9f96c0dafe73e2de3b8b (diff) | |
| download | openshift-e5afeee8e1cfd6b344aac84d95bdf8b66e775bdd.tar.gz openshift-e5afeee8e1cfd6b344aac84d95bdf8b66e775bdd.tar.bz2 openshift-e5afeee8e1cfd6b344aac84d95bdf8b66e775bdd.tar.xz openshift-e5afeee8e1cfd6b344aac84d95bdf8b66e775bdd.zip | |
Merge pull request #4649 from ewolinetz/bz1465718
Merged by openshift-bot
| -rw-r--r-- | roles/openshift_logging_elasticsearch/tasks/main.yaml | 10 | ||||
| -rw-r--r-- | roles/openshift_logging_kibana/tasks/main.yaml | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml index d9ac52cb7..68726aa78 100644 --- a/roles/openshift_logging_elasticsearch/tasks/main.yaml +++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml @@ -173,9 +173,8 @@ selector: component: "{{ es_component }}" provider: openshift - # pending #4091 - #labels: - #- logging-infra: 'support' + labels: + logging-infra: 'support' ports: - port: 9300 @@ -187,9 +186,8 @@ selector: component: "{{ es_component }}" provider: openshift - # pending #4091 - #labels: - #- logging-infra: 'support' + labels: + logging-infra: 'support' ports: - port: 9200 targetPort: "restapi" diff --git a/roles/openshift_logging_kibana/tasks/main.yaml b/roles/openshift_logging_kibana/tasks/main.yaml index bae55ffaa..93cb82793 100644 --- a/roles/openshift_logging_kibana/tasks/main.yaml +++ b/roles/openshift_logging_kibana/tasks/main.yaml @@ -89,9 +89,8 @@ selector: component: "{{ kibana_component }}" provider: openshift - # pending #4091 - #labels: - #- logging-infra: 'support' + labels: + logging-infra: 'support' ports: - port: 443 targetPort: "oaproxy" |