diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-01 11:35:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 11:35:00 -0400 |
| commit | d1e91e82e3cce236ba8fb07ed8c71f6016482562 (patch) | |
| tree | 542bff5d84c7ff2ff8290cd365d15869940b6555 | |
| parent | 7aaeae708369300d770d8282a9cd74a4db775aa0 (diff) | |
| parent | c81235570df3fee30af8a397ac6c9294a42b6c2d (diff) | |
| download | openshift-d1e91e82e3cce236ba8fb07ed8c71f6016482562.tar.gz openshift-d1e91e82e3cce236ba8fb07ed8c71f6016482562.tar.bz2 openshift-d1e91e82e3cce236ba8fb07ed8c71f6016482562.tar.xz openshift-d1e91e82e3cce236ba8fb07ed8c71f6016482562.zip | |
Merge pull request #4341 from richm/curator-ops-host-vols
fix curator host, port params; remove curator es volumes
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 4 | ||||
| -rw-r--r-- | roles/openshift_logging_curator/templates/curator.j2 | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index 551638781..dde76b142 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -194,6 +194,8 @@ vars: generated_certs_dir: "{{openshift.common.config_base}}/logging" openshift_logging_curator_namespace: "{{ openshift_logging_namespace }}" + openshift_logging_curator_es_host: "{{ openshift_logging_es_host }}" + openshift_logging_curator_es_port: "{{ openshift_logging_es_port }}" openshift_logging_curator_master_url: "{{ openshift_logging_master_url }}" openshift_logging_curator_image_prefix: "{{ openshift_logging_image_prefix }}" openshift_logging_curator_image_version: "{{ openshift_logging_image_version }}" @@ -204,6 +206,8 @@ vars: generated_certs_dir: "{{openshift.common.config_base}}/logging" openshift_logging_curator_ops_deployment: true + openshift_logging_curator_es_host: "{{ openshift_logging_es_ops_host }}" + openshift_logging_curator_es_port: "{{ openshift_logging_es_ops_port }}" openshift_logging_curator_namespace: "{{ openshift_logging_namespace }}" openshift_logging_curator_master_url: "{{ openshift_logging_master_url }}" openshift_logging_curator_image_prefix: "{{ openshift_logging_image_prefix }}" diff --git a/roles/openshift_logging_curator/templates/curator.j2 b/roles/openshift_logging_curator/templates/curator.j2 index f8b84861f..1bf9b9de2 100644 --- a/roles/openshift_logging_curator/templates/curator.j2 +++ b/roles/openshift_logging_curator/templates/curator.j2 @@ -89,9 +89,6 @@ spec: - name: config mountPath: /etc/curator/settings readOnly: true - - name: elasticsearch-storage - mountPath: /elasticsearch/persistent - readOnly: true volumes: - name: certs secret: @@ -99,5 +96,3 @@ spec: - name: config configMap: name: logging-curator - - name: elasticsearch-storage - emptyDir: {} |