diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-16 00:35:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 00:35:15 -0400 |
| commit | ceb68a0dd75bb8aaa0791b1d5fb6238a4a40b7bc (patch) | |
| tree | cbdcfbfa3e7e54924a0e31ea8d27a441577bbfbf /roles/openshift_logging | |
| parent | dfb68308220f474534ddba49b247f7766afe51de (diff) | |
| parent | 3973b9fd6fcb80c639c1435e017976319b8c08df (diff) | |
| download | openshift-ceb68a0dd75bb8aaa0791b1d5fb6238a4a40b7bc.tar.gz openshift-ceb68a0dd75bb8aaa0791b1d5fb6238a4a40b7bc.tar.bz2 openshift-ceb68a0dd75bb8aaa0791b1d5fb6238a4a40b7bc.tar.xz openshift-ceb68a0dd75bb8aaa0791b1d5fb6238a4a40b7bc.zip | |
Merge pull request #4294 from richm/fix-es-routes-for-new-logging-roles
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging')
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index 7c1062b77..66dc0e096 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -119,6 +119,12 @@ openshift_logging_elasticsearch_pvc_size: "{{ openshift_logging_es_pvc_size }}" openshift_logging_elasticsearch_pvc_dynamic: "{{ openshift_logging_es_pvc_dynamic }}" openshift_logging_elasticsearch_pvc_pv_selector: "{{ openshift_logging_es_pv_selector }}" + openshift_logging_es_key: "{{ openshift_logging_es_ops_key }}" + openshift_logging_es_cert: "{{ openshift_logging_es_ops_cert }}" + openshift_logging_es_ca_ext: "{{ openshift_logging_es_ops_ca_ext }}" + openshift_logging_es_hostname: "{{ openshift_logging_es_ops_hostname }}" + openshift_logging_es_edge_term_policy: "{{ openshift_logging_es_ops_edge_term_policy | default('') }}" + openshift_logging_es_allow_external: "{{ openshift_logging_es_ops_allow_external }}" with_together: - "{{ openshift_logging_facts.elasticsearch_ops.deploymentconfigs }}" @@ -141,6 +147,12 @@ openshift_logging_elasticsearch_pvc_size: "{{ openshift_logging_es_pvc_size }}" openshift_logging_elasticsearch_pvc_dynamic: "{{ openshift_logging_es_pvc_dynamic }}" openshift_logging_elasticsearch_pvc_pv_selector: "{{ openshift_logging_es_pv_selector }}" + openshift_logging_es_key: "{{ openshift_logging_es_ops_key }}" + openshift_logging_es_cert: "{{ openshift_logging_es_ops_cert }}" + openshift_logging_es_ca_ext: "{{ openshift_logging_es_ops_ca_ext }}" + openshift_logging_es_hostname: "{{ openshift_logging_es_ops_hostname }}" + openshift_logging_es_edge_term_policy: "{{ openshift_logging_es_ops_edge_term_policy | default('') }}" + openshift_logging_es_allow_external: "{{ openshift_logging_es_ops_allow_external }}" with_sequence: count={{ openshift_logging_es_ops_cluster_size | int - openshift_logging_facts.elasticsearch_ops.deploymentconfigs.keys() | count }} when: |