diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-08 11:27:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-08 11:27:58 -0500 |
| commit | 6c402798d6505a85c786595a3a86395aebb5e8f2 (patch) | |
| tree | 0ab9c39751f295e2cf2028880091a467260307c3 /roles/openshift_logging/tasks/set_es_storage.yaml | |
| parent | f4a514a769c6a22c8adb3053f92af806d8228abd (diff) | |
| parent | 8b5dd3feeede035ddc0b66ad0b4008a5edba1a07 (diff) | |
| download | openshift-6c402798d6505a85c786595a3a86395aebb5e8f2.tar.gz openshift-6c402798d6505a85c786595a3a86395aebb5e8f2.tar.bz2 openshift-6c402798d6505a85c786595a3a86395aebb5e8f2.tar.xz openshift-6c402798d6505a85c786595a3a86395aebb5e8f2.zip | |
Merge pull request #4026 from ewolinetz/cherry_picks_15
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/tasks/set_es_storage.yaml')
| -rw-r--r-- | roles/openshift_logging/tasks/set_es_storage.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_logging/tasks/set_es_storage.yaml b/roles/openshift_logging/tasks/set_es_storage.yaml index 0bb4d5ee5..4afe4e641 100644 --- a/roles/openshift_logging/tasks/set_es_storage.yaml +++ b/roles/openshift_logging/tasks/set_es_storage.yaml @@ -36,7 +36,7 @@ - name: Generating PersistentVolumeClaims template: src=pvc.j2 dest={{mktemp.stdout}}/templates/logging-{{obj_name}}-pvc.yaml vars: - obj_name: "{{ es_pvc_prefix }}-{{ es_pvc_names | count }}" + obj_name: "{{ es_pvc_prefix }}-{{ es_pvc_names_count | int + es_pvc_count | int }}" size: "{{ es_pvc_size }}" access_modes: "{{ openshift_logging_storage_access_modes }}" pv_selector: "{{ es_pv_selector }}" @@ -47,7 +47,7 @@ - name: Generating PersistentVolumeClaims - Dynamic template: src=pvc.j2 dest={{mktemp.stdout}}/templates/logging-{{obj_name}}-pvc.yaml vars: - obj_name: "{{ es_pvc_prefix }}-{{ es_pvc_names | count }}" + obj_name: "{{ es_pvc_prefix }}-{{ es_pvc_names_count | int + es_pvc_count | int }}" annotations: volume.alpha.kubernetes.io/storage-class: "dynamic" size: "{{ es_pvc_size }}" @@ -57,7 +57,7 @@ check_mode: no changed_when: no - - set_fact: es_storage_claim="{{ es_pvc_prefix }}-{{ es_pvc_names | count }}" + - set_fact: es_storage_claim="{{ es_pvc_prefix }}-{{ es_pvc_names_count | int + es_pvc_count | int }}" when: - es_pvc_size | search('^\d.*') |