Browse Source

Add resource_filters.json to Cinder's configmap

During the Stein development cycle, Cinder removed the deprecated
query_volume_filters configuration option with
Icd311db7f88c3c274d9a362eb96519e46c7e4d17.

This chart update will add resource_filters.json to the configmap and
provides the default values for the filter keys to enable filtering in
the list APIs.

Change-Id: I31263e9ce06d31773e961ae5d1252e062a38a4e5
Signed-off-by: Robert Church <robert.church@windriver.com>
Robert Church 1 month ago
parent
commit
d1fbf4ac14
3 changed files with 44 additions and 0 deletions
  1. 1
    0
      cinder/templates/configmap-etc.yaml
  2. 4
    0
      cinder/templates/deployment-api.yaml
  3. 39
    0
      cinder/values.yaml

+ 1
- 0
cinder/templates/configmap-etc.yaml View File

@@ -121,6 +121,7 @@ data:
121 121
   policy.json: {{ toJson .Values.conf.policy | b64enc }}
122 122
   cinder_sudoers: {{ $envAll.Values.conf.cinder_sudoers | b64enc }}
123 123
   rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }}
124
+  resource_filters.json: {{ toJson .Values.conf.resource_filters | b64enc }}
124 125
 {{- range $key, $value := $envAll.Values.conf.rootwrap_filters }}
125 126
 {{- $filePrefix := replace "_" "-"  $key }}
126 127
   {{ printf "%s.filters" $filePrefix }}: {{ $value.content | b64enc }}

+ 4
- 0
cinder/templates/deployment-api.yaml View File

@@ -119,6 +119,10 @@ spec:
119 119
               mountPath: /etc/cinder/policy.json
120 120
               subPath: policy.json
121 121
               readOnly: true
122
+            - name: cinder-etc
123
+              mountPath: {{ .Values.conf.cinder.DEFAULT.resource_query_filters_file }}
124
+              subPath: resource_filters.json
125
+              readOnly: true
122 126
             {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }}
123 127
             - name: cinder-coordination
124 128
               mountPath: {{ ( split "://" .Values.conf.cinder.coordination.backend_url )._1 }}

+ 39
- 0
cinder/values.yaml View File

@@ -721,6 +721,7 @@ conf:
721 721
         chunk_size: 8
722 722
   cinder:
723 723
     DEFAULT:
724
+      resource_query_filters_file: /etc/cinder/resource_filters.json
724 725
       log_config_append: /etc/cinder/logging.conf
725 726
       use_syslog: false
726 727
       use_stderr: true
@@ -871,6 +872,44 @@ conf:
871 872
           sla:
872 873
             failure_rate:
873 874
               max: 0
875
+  resource_filters:
876
+    volume:
877
+      - name
878
+      - status
879
+      - metadata
880
+      - bootable
881
+      - migration_status
882
+      - availability_zone
883
+      - group_id
884
+    backup:
885
+      - name
886
+      - status
887
+      - volume_id
888
+    snapshot:
889
+      - name
890
+      - status
891
+      - volume_id
892
+      - metadata
893
+      - availability_zone
894
+    group: []
895
+    group_snapshot:
896
+      - status
897
+      - group_id
898
+    attachment:
899
+      - volume_id
900
+      - status
901
+      - instance_id
902
+      - attach_status
903
+    message:
904
+      - resource_uuid
905
+      - resource_type
906
+      - event_id
907
+      - request_id
908
+      - message_level
909
+    pool:
910
+      - name
911
+      - volume_type
912
+    volume_type: []
874 913
 
875 914
 backup:
876 915
   external_ceph_rbd:

Loading…
Cancel
Save