diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-03-15 09:16:17 -0500 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-03-15 09:16:17 -0500 |
| commit | 6962f09c1dbb4e963b32667d7106a3c547a35a0f (patch) | |
| tree | a76a3086737d620df82d4a1af141fa048c7b3e99 /roles/openshift_logging/tasks | |
| parent | 15130f01c9c80b67528d4e76b237822921a0a0c9 (diff) | |
| download | openshift-6962f09c1dbb4e963b32667d7106a3c547a35a0f.tar.gz openshift-6962f09c1dbb4e963b32667d7106a3c547a35a0f.tar.bz2 openshift-6962f09c1dbb4e963b32667d7106a3c547a35a0f.tar.xz openshift-6962f09c1dbb4e963b32667d7106a3c547a35a0f.zip | |
Cherry picked from #3657
Diffstat (limited to 'roles/openshift_logging/tasks')
| -rw-r--r-- | roles/openshift_logging/tasks/generate_pvcs.yaml | 6 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/install_elasticsearch.yaml | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/roles/openshift_logging/tasks/generate_pvcs.yaml b/roles/openshift_logging/tasks/generate_pvcs.yaml index e1629908f..fa7a86c27 100644 --- a/roles/openshift_logging/tasks/generate_pvcs.yaml +++ b/roles/openshift_logging/tasks/generate_pvcs.yaml @@ -15,8 +15,7 @@ vars: obj_name: "{{claim_name}}" size: "{{es_pvc_size}}" - access_modes: - - "{{ es_access_modes }}" + access_modes: "{{ es_access_modes | list }}" pv_selector: "{{es_pv_selector}}" with_items: - "{{es_pvc_pool | default([])}}" @@ -35,8 +34,7 @@ annotations: volume.alpha.kubernetes.io/storage-class: "dynamic" size: "{{es_pvc_size}}" - access_modes: - - "{{ es_access_modes }}" + access_modes: "{{ es_access_modes | list }}" pv_selector: "{{es_pv_selector}}" with_items: - "{{es_pvc_pool|default([])}}" diff --git a/roles/openshift_logging/tasks/install_elasticsearch.yaml b/roles/openshift_logging/tasks/install_elasticsearch.yaml index 086f9e33f..8066bb481 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={{[]}} - name: Generate PersistentVolumeClaims @@ -68,6 +71,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 |