From b58c5d25156c9f8be6086107bfe7adff2b98f390 Mon Sep 17 00:00:00 2001
From: Dae Seong Kim <daeseong.kim@sk.com>
Date: Tue, 16 May 2017 15:37:18 +0900
Subject: [PATCH] move ceph info under conf property

Now ceph.enabled property in values.yaml file is not used anywhere
and almost all configuration about ceph is moved under conf property.
In addition, default values.yaml file has no ceph.glance_user property
and still the property is used in templetes.

It looks it's time to move remained ceph properties under conf tree
and remove ceph tree.

Closes-Bug: #1691011
Change-Id: I98f7a85eef517ab806432a7342aa3601e8183e0b
---
 glance/templates/deployment-api.yaml                 |  6 +++---
 glance/templates/etc/_ceph.client.glance.keyring.tpl |  6 +++---
 glance/templates/etc/_ceph.conf.tpl                  |  4 ++--
 glance/values.yaml                                   | 10 ++--------
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml
index e10ed317d8..cbb49b6b04 100644
--- a/glance/templates/deployment-api.yaml
+++ b/glance/templates/deployment-api.yaml
@@ -86,9 +86,9 @@ spec:
               mountPath: /etc/ceph/ceph.conf
               subPath: ceph.conf
               readOnly: true
-            - name: glance-etc
-              mountPath: /etc/ceph/ceph.client.{{ .Values.ceph.glance_user }}.keyring
-              subPath: ceph.client.{{ .Values.ceph.glance_user }}.keyring
+            - name: cephclientglancekeyring
+              mountPath: /etc/ceph/ceph.client.{{ .Values.conf.glance.glance_store.glance.store.rbd_store_user }}.keyring
+              subPath: ceph.client.{{ .Values.conf.glance.glance_store.glance.store.rbd_store_user }}.keyring
               readOnly: true
 {{- end }}
       volumes:
diff --git a/glance/templates/etc/_ceph.client.glance.keyring.tpl b/glance/templates/etc/_ceph.client.glance.keyring.tpl
index 9e1cc90455..0e0e639a2e 100644
--- a/glance/templates/etc/_ceph.client.glance.keyring.tpl
+++ b/glance/templates/etc/_ceph.client.glance.keyring.tpl
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-[client.{{ .Values.ceph.glance_user }}]
-{{- if .Values.ceph.glance_keyring }}
-    key = {{ .Values.ceph.glance_keyring }}
+[client.{{ .Values.conf.glance.glance_store.glance.store.rbd_store_user }}]
+{{- if .Values.conf.ceph.keyring }}
+    key = {{ .Values.conf.ceph.keyring }}
 {{- else }}
     key = {{- include "secrets/ceph-client-key" . -}}
 {{- end }}
diff --git a/glance/templates/etc/_ceph.conf.tpl b/glance/templates/etc/_ceph.conf.tpl
index e548528f35..e42694fc27 100644
--- a/glance/templates/etc/_ceph.conf.tpl
+++ b/glance/templates/etc/_ceph.conf.tpl
@@ -15,9 +15,9 @@
 [global]
 rgw_thread_pool_size = 1024
 rgw_num_rados_handles = 100
-{{- if .Values.ceph.monitors }}
+{{- if .Values.conf.ceph.monitors }}
 [mon]
-{{ range .Values.ceph.monitors }}
+{{ range .Values.conf.ceph.monitors }}
     [mon.{{ . }}]
       host = {{ . }}
       mon_addr = {{ . }}
diff --git a/glance/values.yaml b/glance/values.yaml
index f99c557c6e..3a19452505 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -72,6 +72,8 @@ keystone:
 
 conf:
   ceph:
+    monitors: []
+    keyring: null
     override:
     append:
   ceph_client:
@@ -144,14 +146,6 @@ network:
       enabled: false
       port: 30091
 
-ceph:
-  enabled: true
-  monitors: []
-  # a null value for the keyring will
-  # attempt to use the key from
-  # common/secrets/ceph-client-key
-  glance_keyring: null
-
 volume:
   class_path: volume.beta.kubernetes.io/storage-class
   class_name: general