Merge "Ceph RGW cleanup"

This commit is contained in:
Jenkins 2017-04-23 00:41:13 +00:00 committed by Gerrit Code Review
commit 7188406654
2 changed files with 2 additions and 5 deletions

View File

@ -84,7 +84,7 @@ spec:
resources:
requests:
memory: {{ .Values.resources.rgw.requests.memory | quote }}
cpu: {{ .Values.resources.rgwrequests.cpu | quote }}
cpu: {{ .Values.resources.rgw.requests.cpu | quote }}
limits:
memory: {{ .Values.resources.rgw.limits.memory | quote }}
cpu: {{ .Values.resources.rgw.limits.cpu | quote }}

View File

@ -41,10 +41,7 @@ storage:
var_directory: /var/lib/openstack-helm/ceph/ceph
mon_directory: /var/lib/openstack-helm/ceph/mon
# rgw is optionall disabled
rgw:
enabled: false
# rgw is optionally disabled
rgw:
enabled: false