openstack/openstack-helm
Code Issues Proposed changes

Ceph-storage-init : make configmap and secret names to be driven via chart values

Browse Source 
This is make ceph configmap and admin keyring secret names using
in storage init scripts to be read  from chart values as we may
have two ceph clusters  gets activated in one namespace and
each ceph clsuter will have its own configmap and admin secret names.

Change-Id: I84d94f3ac21e602c50619e456ff327ae1da53622
This commit is contained in:
Chinasubbareddy M 2018-08-30 11:36:32 -05:00 committed by chinasubbareddy mallavarapu
parent 07c95b04b0
commit b2714cb111
18 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/templates/deployment-backup.yaml
View File

@ -207,7 +207,7 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
defaultMode: 0444
{{ end }}
{{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph" }}

2
cinder/templates/deployment-volume.yaml
View File

@ -167,7 +167,7 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
defaultMode: 0444
- name: ceph-keyring
secret:

4
cinder/templates/job-backup-storage-init.yaml
View File

@ -155,7 +155,7 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
defaultMode: 0444
{{- if .Values.backup.external_ceph_rbd.enabled }}
- name: cinder-etc
@ -166,7 +166,7 @@ spec:
{{- if empty .Values.conf.ceph.admin_keyring }}
- name: ceph-keyring
secret:
secretName: pvc-ceph-client-key
secretName: {{ .Values.ceph_client.user_secret_name }}
{{ end }}
{{ end }}
{{- end }}

4
cinder/templates/job-storage-init.yaml
View File

@ -141,12 +141,12 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
defaultMode: 0444
{{- if empty .Values.conf.ceph.admin_keyring }}
- name: ceph-keyring
secret:
secretName: pvc-ceph-client-key
secretName: {{ .Values.ceph_client.user_secret_name }}
{{- end }}
{{- end }}
{{- end }}

4
cinder/values.yaml
View File

@ -270,6 +270,10 @@ network:
enabled: false
port: 30877
ceph_client:
configmap: ceph-etc
user_secret_name: pvc-ceph-client-key
conf:
paste:
composite:osapi_volume:

2
glance/templates/deployment-api.yaml
View File

@ -173,7 +173,7 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
defaultMode: 0444
- name: ceph-keyring
secret:

4
glance/templates/job-storage-init.yaml
View File

@ -156,12 +156,12 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
defaultMode: 0444
{{- if empty .Values.conf.ceph.admin_keyring }}
- name: ceph-keyring
secret:
secretName: pvc-ceph-client-key
secretName: {{ .Values.ceph_client.user_secret_name }}
{{ end }}
{{ end }}
{{- if eq .Values.storage "pvc" }}

4
glance/values.yaml
View File

@ -79,6 +79,10 @@ bootstrap:
hypervisor_type: "qemu"
os_distro: "cirros"
ceph_client:
configmap: ceph-etc
user_secret_name: pvc-ceph-client-key
conf:
rally_tests:
run_tempest: false

2
gnocchi/templates/daemonset-metricd.yaml
View File

@ -109,7 +109,7 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
- name: ceph-keyring
secret:
secretName: {{ .Values.secrets.rbd | quote }}

2
gnocchi/templates/daemonset-statsd.yaml
View File

@ -115,7 +115,7 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
- name: ceph-keyring
secret:
secretName: {{ .Values.secrets.rbd | quote }}

2
gnocchi/templates/deployment-api.yaml
View File

@ -134,7 +134,7 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
- name: ceph-keyring
secret:
secretName: {{ .Values.secrets.rbd | quote }}

2
gnocchi/templates/job-db-sync.yaml
View File

@ -87,7 +87,7 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
- name: ceph-keyring
secret:
secretName: {{ .Values.secrets.rbd | quote }}

4
gnocchi/templates/job-storage-init.yaml
View File

@ -124,9 +124,9 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
defaultMode: 0444
- name: ceph-keyring
secret:
secretName: pvc-ceph-client-key
secretName: {{ .Values.ceph_client.user_secret_name }}
{{- end }}

4
gnocchi/values.yaml
View File

@ -422,6 +422,10 @@ conf:
auth_version: v3
memcache_security_strategy: ENCRYPT
ceph_client:
configmap: ceph-etc
user_secret_name: pvc-ceph-client-key
secrets:
identity:
admin: gnocchi-keystone-admin

4
libvirt/templates/daemonset-libvirt.yaml
View File

@ -195,12 +195,12 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
defaultMode: 0444
{{- if empty .Values.conf.ceph.cinder.keyring }}
- name: ceph-keyring
secret:
secretName: pvc-ceph-client-key
secretName: {{ .Values.ceph_client.user_secret_name }}
{{ end }}
{{ end }}
- name: libmodules

4
libvirt/values.yaml
View File

@ -58,6 +58,10 @@ endpoints:
registry:
node: 5000
ceph_client:
configmap: ceph-etc
user_secret_name: pvc-ceph-client-key
conf:
ceph:
enabled: true

4
nova/templates/daemonset-compute.yaml
View File

@ -298,12 +298,12 @@ spec:
emptyDir: {}
- name: ceph-etc
configMap:
name: ceph-etc
name: {{ .Values.ceph_client.configmap }}
defaultMode: 0444
{{- if empty .Values.conf.ceph.cinder.keyring }}
- name: ceph-keyring
secret:
secretName: pvc-ceph-client-key
secretName: {{ .Values.ceph_client.user_secret_name }}
{{ end }}
{{ end }}
- name: libmodules

4
nova/values.yaml
View File

@ -443,6 +443,10 @@ ssh:
- ecdsa
- ed25519
ceph_client:
configmap: ceph-etc
user_secret_name: pvc-ceph-client-key
conf:
ceph:
enabled: true