openstack/openstack-helm
Code Issues Proposed changes

bug fix for rgw crashloops

Browse Source
This commit is contained in:
Brandon B. Jozsa 2016-12-23 17:11:33 -05:00
parent c6dd9b617f
commit 91c59e1fd2
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceph/templates/deployment.yaml
View File

@ -230,6 +230,8 @@ spec:
memory: "100Mi" memory: "100Mi"
cpu: "2000m" cpu: "2000m"
--- ---
# rgw not required: using if statement for deployment
{{- if .Values.rgw.enabled }}
kind: Deployment kind: Deployment
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
metadata: metadata:
@ -304,3 +306,5 @@ spec:
limits: limits:
memory: "500Mi" memory: "500Mi"
cpu: ".5" cpu: ".5"
{{ end }}
# end: rgw removed optionally

4
ceph/values.yaml
View File

@ -24,6 +24,10 @@ storage:
osd_directory: /var/lib/aic-helm/ceph/osd osd_directory: /var/lib/aic-helm/ceph/osd
var_directory: /var/lib/aic-helm/ceph/ceph var_directory: /var/lib/aic-helm/ceph/ceph
# rgw is optionall disabled
rgw:
enabled: false
# Setting this to false will assume you will # Setting this to false will assume you will
# setup and orchestrate your own secrets and # setup and orchestrate your own secrets and
# configmaps outside of this helm chart # configmaps outside of this helm chart