diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-15 13:23:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 13:23:13 -0400 |
| commit | 91ca8e8134bc0af84478125174c58f0fb2b8943c (patch) | |
| tree | ffc967d2d6764fb074fdff67bdd859380acd4bd3 /roles/openshift_logging/tasks/install_elasticsearch.yaml | |
| parent | 6362a2cc4e8dfa902f4e04c9b564d3933fbb755e (diff) | |
| parent | 290f703cc0341fcec66bc6ba8f0c05a1e02649b6 (diff) | |
| download | openshift-91ca8e8134bc0af84478125174c58f0fb2b8943c.tar.gz openshift-91ca8e8134bc0af84478125174c58f0fb2b8943c.tar.bz2 openshift-91ca8e8134bc0af84478125174c58f0fb2b8943c.tar.xz openshift-91ca8e8134bc0af84478125174c58f0fb2b8943c.zip | |
Merge pull request #3629 from ewolinetz/logging_15_cherrypick
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/tasks/install_elasticsearch.yaml')
| -rw-r--r-- | roles/openshift_logging/tasks/install_elasticsearch.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/install_elasticsearch.yaml b/roles/openshift_logging/tasks/install_elasticsearch.yaml index 086f9e33f..7cf39234f 100644 --- a/roles/openshift_logging/tasks/install_elasticsearch.yaml +++ b/roles/openshift_logging/tasks/install_elasticsearch.yaml @@ -4,6 +4,8 @@ - set_fact: es_pvc_pool={{[]}} +- set_fact: openshift_logging_es_pvc_prefix="{{ openshift_logging_es_pvc_prefix | default('logging-es') }}" + - name: Generate PersistentVolumeClaims include: "{{ role_path}}/tasks/generate_pvcs.yaml" vars: @@ -58,6 +60,8 @@ - name: Getting current ES deployment size set_fact: openshift_logging_current_es_ops_size={{ openshift_logging_facts.elasticsearch_ops.deploymentconfigs.keys() | length }} +- set_fact: openshift_logging_es_ops_pvc_prefix="{{ openshift_logging_es_ops_pvc_prefix | default('logging-es-ops') }}" + - name: Validate Elasticsearch cluster size for Ops fail: msg="The openshift_logging_es_ops_cluster_size may not be scaled down more than 1 less (or 0) the number of Elasticsearch nodes already deployed" vars: |