diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-18 10:35:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 10:35:59 -0400 |
| commit | 36d6b8ab6ee42a8a98321ae371398cf520ae8b71 (patch) | |
| tree | c3b66e05671bffee5c3fd2c5edf4c9abd6f105fa | |
| parent | 63b77fbe00e4c724452a0256c6fdafc165755962 (diff) | |
| parent | 5b838f1126edc340a3da0db1c05be5573d726468 (diff) | |
| download | openshift-36d6b8ab6ee42a8a98321ae371398cf520ae8b71.tar.gz openshift-36d6b8ab6ee42a8a98321ae371398cf520ae8b71.tar.bz2 openshift-36d6b8ab6ee42a8a98321ae371398cf520ae8b71.tar.xz openshift-36d6b8ab6ee42a8a98321ae371398cf520ae8b71.zip | |
Merge pull request #5791 from zgalor/fix_selector_default
Fix pvc selector default to be empty dict instead of string
| -rw-r--r-- | roles/openshift_prometheus/defaults/main.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_prometheus/defaults/main.yaml b/roles/openshift_prometheus/defaults/main.yaml index ab3d4e31e..c08bec4cb 100644 --- a/roles/openshift_prometheus/defaults/main.yaml +++ b/roles/openshift_prometheus/defaults/main.yaml @@ -21,19 +21,19 @@ openshift_prometheus_storage_type: pvc openshift_prometheus_pvc_name: prometheus openshift_prometheus_pvc_size: "{{ openshift_prometheus_storage_volume_size | default('10Gi') }}" openshift_prometheus_pvc_access_modes: [ReadWriteOnce] -openshift_prometheus_pvc_pv_selector: "{{ openshift_prometheus_storage_labels | default('') }}" +openshift_prometheus_pvc_pv_selector: "{{ openshift_prometheus_storage_labels | default({}) }}" openshift_prometheus_alertmanager_storage_type: pvc openshift_prometheus_alertmanager_pvc_name: prometheus-alertmanager openshift_prometheus_alertmanager_pvc_size: "{{ openshift_prometheus_alertmanager_storage_volume_size | default('10Gi') }}" openshift_prometheus_alertmanager_pvc_access_modes: [ReadWriteOnce] -openshift_prometheus_alertmanager_pvc_pv_selector: "{{ openshift_prometheus_alertmanager_storage_labels | default('') }}" +openshift_prometheus_alertmanager_pvc_pv_selector: "{{ openshift_prometheus_alertmanager_storage_labels | default({}) }}" openshift_prometheus_alertbuffer_storage_type: pvc openshift_prometheus_alertbuffer_pvc_name: prometheus-alertbuffer openshift_prometheus_alertbuffer_pvc_size: "{{ openshift_prometheus_alertbuffer_storage_volume_size | default('10Gi') }}" openshift_prometheus_alertbuffer_pvc_access_modes: [ReadWriteOnce] -openshift_prometheus_alertbuffer_pvc_pv_selector: "{{ openshift_prometheus_alertbuffer_storage_labels | default('') }}" +openshift_prometheus_alertbuffer_pvc_pv_selector: "{{ openshift_prometheus_alertbuffer_storage_labels | default({}) }}" # container resources openshift_prometheus_cpu_limit: null |