summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/tasks/install_elasticsearch.yaml
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-03-10 16:08:35 -0600
committerewolinetz <ewolinet@redhat.com>2017-03-10 16:25:22 -0600
commit290f703cc0341fcec66bc6ba8f0c05a1e02649b6 (patch)
treed5b280cbd2988a0b4bc2e3519419824b43280558 /roles/openshift_logging/tasks/install_elasticsearch.yaml
parent39d078c8b1a17f3e4b827f9962a9f317a6464f3e (diff)
downloadopenshift-290f703cc0341fcec66bc6ba8f0c05a1e02649b6.tar.gz
openshift-290f703cc0341fcec66bc6ba8f0c05a1e02649b6.tar.bz2
openshift-290f703cc0341fcec66bc6ba8f0c05a1e02649b6.tar.xz
openshift-290f703cc0341fcec66bc6ba8f0c05a1e02649b6.zip
cherry picking from #3621 #3614 #3627
Diffstat (limited to 'roles/openshift_logging/tasks/install_elasticsearch.yaml')
-rw-r--r--roles/openshift_logging/tasks/install_elasticsearch.yaml4
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: