diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-03 13:54:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 13:54:37 -0700 |
| commit | 857ae368258799a747eb5f5868184cc6f71c8db4 (patch) | |
| tree | 281f16350c6016ef11b1c8599e5a4005db965520 /roles | |
| parent | 6d8a25425e0b011ac5bd6c54dca2a61f56e356c6 (diff) | |
| parent | 6f7ea85df1e5e3d781aec60df9a433fb7f71051c (diff) | |
| download | openshift-857ae368258799a747eb5f5868184cc6f71c8db4.tar.gz openshift-857ae368258799a747eb5f5868184cc6f71c8db4.tar.bz2 openshift-857ae368258799a747eb5f5868184cc6f71c8db4.tar.xz openshift-857ae368258799a747eb5f5868184cc6f71c8db4.zip | |
Merge pull request #5983 from ewolinetz/37_bz1508150
Automatic merge from submit-queue.
Use the currently attached pvc for an ES dc if available
Otherwise fall back to current logic of labelled PVCs or creating if necessary.
This is to address https://bugzilla.redhat.com/show_bug.cgi?id=1508150
The order of the PVC priority is as follows:
1. The PVC currently claimed on the DC
1. A PVC from the list of PVCs as collected by logging_facts
1. Create a new PVC
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index b98e281a3..cec295d65 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -78,7 +78,7 @@ generated_certs_dir: "{{openshift.common.config_base}}/logging" openshift_logging_elasticsearch_namespace: "{{ openshift_logging_namespace }}" openshift_logging_elasticsearch_deployment_name: "{{ outer_item.0.name }}" - openshift_logging_elasticsearch_pvc_name: "{{ openshift_logging_es_pvc_prefix ~ '-' ~ outer_item.2 if outer_item.1 is none else outer_item.1 }}" + openshift_logging_elasticsearch_pvc_name: "{{ outer_item.0.volumes['elasticsearch-storage'].persistentVolumeClaim.claimName if outer_item.0.volumes['elasticsearch-storage'].persistentVolumeClaim is defined else openshift_logging_es_pvc_prefix ~ '-' ~ outer_item.2 if outer_item.1 is none else outer_item.1 }}" openshift_logging_elasticsearch_replica_count: "{{ openshift_logging_es_cluster_size | int }}" openshift_logging_elasticsearch_storage_type: "{{ elasticsearch_storage_type }}" @@ -136,7 +136,7 @@ generated_certs_dir: "{{openshift.common.config_base}}/logging" openshift_logging_elasticsearch_namespace: "{{ openshift_logging_namespace }}" openshift_logging_elasticsearch_deployment_name: "{{ outer_item.0.name }}" - openshift_logging_elasticsearch_pvc_name: "{{ openshift_logging_es_ops_pvc_prefix ~ '-' ~ outer_item.2 if outer_item.1 is none else outer_item.1 }}" + openshift_logging_elasticsearch_pvc_name: "{{ outer_item.0.volumes['elasticsearch-storage'].persistentVolumeClaim.claimName if outer_item.0.volumes['elasticsearch-storage'].persistentVolumeClaim is defined else openshift_logging_es_ops_pvc_prefix ~ '-' ~ outer_item.2 if outer_item.1 is none else outer_item.1 }}" openshift_logging_elasticsearch_ops_deployment: true openshift_logging_elasticsearch_replica_count: "{{ openshift_logging_es_ops_cluster_size | int }}" |