From 1dd9ef153ff646b12e0f0ecba7f14930d212be17 Mon Sep 17 00:00:00 2001 From: Larry Rensing Date: Fri, 21 Apr 2017 16:02:47 +0000 Subject: [PATCH] Ceph RGW cleanup Fixes incorrect variable reference in deployment-rgw and removes a duplicate value in values.yaml Change-Id: I8b922cbb9d6f9b6153d4ccfcfa991bd7a51ef185 --- ceph/templates/deployment-rgw.yaml | 2 +- ceph/values.yaml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ceph/templates/deployment-rgw.yaml b/ceph/templates/deployment-rgw.yaml index 430113beb5..619858eeb7 100644 --- a/ceph/templates/deployment-rgw.yaml +++ b/ceph/templates/deployment-rgw.yaml @@ -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 }} diff --git a/ceph/values.yaml b/ceph/values.yaml index e865f7d06e..8c709dd486 100644 --- a/ceph/values.yaml +++ b/ceph/values.yaml @@ -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