diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-16 14:25:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 14:25:43 -0400 |
| commit | a4c8b2d019756cbba01d9d2f41add3926c21fb8d (patch) | |
| tree | f12b59aefd522933a97957dc3a7413448f3d96b8 /roles/openshift_logging/tasks/install_elasticsearch.yaml | |
| parent | 4c314a6fdce13a0e74736c1548dd0d280d315536 (diff) | |
| parent | 52726611f182c6db390d7a964f0bf24fed297761 (diff) | |
| download | openshift-a4c8b2d019756cbba01d9d2f41add3926c21fb8d.tar.gz openshift-a4c8b2d019756cbba01d9d2f41add3926c21fb8d.tar.bz2 openshift-a4c8b2d019756cbba01d9d2f41add3926c21fb8d.tar.xz openshift-a4c8b2d019756cbba01d9d2f41add3926c21fb8d.zip | |
Merge pull request #3664 from ewolinetz/logging_cherrypick_3657
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/tasks/install_elasticsearch.yaml')
| -rw-r--r-- | roles/openshift_logging/tasks/install_elasticsearch.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/install_elasticsearch.yaml b/roles/openshift_logging/tasks/install_elasticsearch.yaml index 7cf39234f..1b750bcbe 100644 --- a/roles/openshift_logging/tasks/install_elasticsearch.yaml +++ b/roles/openshift_logging/tasks/install_elasticsearch.yaml @@ -2,6 +2,9 @@ - name: Getting current ES deployment size set_fact: openshift_logging_current_es_size={{ openshift_logging_facts.elasticsearch.deploymentconfigs.keys() | length }} +- set_fact: openshift_logging_es_pvc_prefix="logging-es" + when: "not openshift_logging_es_pvc_prefix or openshift_logging_es_pvc_prefix == ''" + - set_fact: es_pvc_pool={{[]}} - set_fact: openshift_logging_es_pvc_prefix="{{ openshift_logging_es_pvc_prefix | default('logging-es') }}" @@ -72,6 +75,9 @@ - "{{es_dcs | length - openshift_logging_es_ops_cluster_size|int | abs > 1}}" check_mode: no +- set_fact: openshift_logging_es_ops_pvc_prefix="logging-es-ops" + when: "not openshift_logging_es_ops_pvc_prefix or openshift_logging_es_ops_pvc_prefix == ''" + - set_fact: es_pvc_pool={{[]}} - name: Generate PersistentVolumeClaims for Ops |