983685837f
The new storage-init script doesn't handle the case in which the rbd pool user already exists. This PS solves the issue by improving the script. Change-Id: I22c55429d3077393b279fb784845db41a69b5469 Closes-Bug: 1719081
131 lines
4.9 KiB
YAML
131 lines
4.9 KiB
YAML
{{/*
|
|
Copyright 2017 The Openstack-Helm Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/}}
|
|
|
|
{{- if .Values.manifests.job_storage_init }}
|
|
{{- $envAll := . }}
|
|
{{- $dependencies := .Values.dependencies.storage_init }}
|
|
---
|
|
apiVersion: batch/v1
|
|
kind: Job
|
|
metadata:
|
|
name: glance-storage-init
|
|
spec:
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{ tuple $envAll "glance" "storage-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
|
spec:
|
|
restartPolicy: OnFailure
|
|
nodeSelector:
|
|
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
|
|
initContainers:
|
|
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
|
{{ if or (eq .Values.storage "rbd") (eq .Values.storage "radosgw") }}
|
|
- name: ceph-keyring-placement
|
|
image: {{ .Values.images.api }}
|
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
|
securityContext:
|
|
runAsUser: {{ .Values.pod.user.glance.uid }}
|
|
command:
|
|
- /tmp/ceph-admin-keyring.sh
|
|
volumeMounts:
|
|
- name: etcceph
|
|
mountPath: /etc/ceph
|
|
- name: glance-bin
|
|
mountPath: /tmp/ceph-admin-keyring.sh
|
|
subPath: ceph-admin-keyring.sh
|
|
readOnly: true
|
|
- name: ceph-keyring
|
|
mountPath: /tmp/client-keyring
|
|
subPath: key
|
|
readOnly: true
|
|
{{ end }}
|
|
containers:
|
|
- name: glance-storage-init
|
|
image: {{ .Values.images.storage_init }}
|
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
|
env:
|
|
- name: NAMESPACE
|
|
valueFrom:
|
|
fieldRef:
|
|
fieldPath: metadata.namespace
|
|
- name: STORAGE_BACKEND
|
|
value: {{ .Values.storage | quote }}
|
|
{{- if eq .Values.storage "rbd" }}
|
|
- name: RBD_POOL_NAME
|
|
value: {{ .Values.conf.glance.glance_store.rbd_store_pool | quote }}
|
|
- name: RBD_POOL_USER
|
|
value: {{ .Values.conf.glance.glance_store.rbd_store_user | quote }}
|
|
- name: RBD_POOL_CHUNK_SIZE
|
|
value: {{ .Values.conf.glance.glance_store.rbd_store_chunk_size | quote }}
|
|
- name: RBD_POOL_SECRET
|
|
value: {{ .Values.secrets.rbd | quote }}
|
|
{{ end }}
|
|
{{- if eq .Values.storage "radosgw" }}
|
|
- name: RADOSGW_USERNAME
|
|
value: {{ .Values.endpoints.ceph_object_store.auth.user.username | quote }}
|
|
- name: RADOSGW_PASSWORD
|
|
value: {{ .Values.endpoints.ceph_object_store.auth.user.password | quote }}
|
|
- name: RADOSGW_TMPURL_KEY
|
|
value: {{ .Values.endpoints.ceph_object_store.auth.user.tmpurlkey | quote }}
|
|
{{ end }}
|
|
command:
|
|
- /tmp/storage-init.sh
|
|
volumeMounts:
|
|
- name: glance-bin
|
|
mountPath: /tmp/storage-init.sh
|
|
subPath: storage-init.sh
|
|
readOnly: true
|
|
{{ if or (eq .Values.storage "rbd") (eq .Values.storage "radosgw") }}
|
|
- name: etcceph
|
|
mountPath: /etc/ceph
|
|
- name: ceph-etc
|
|
mountPath: /etc/ceph/ceph.conf
|
|
subPath: ceph.conf
|
|
readOnly: true
|
|
- name: ceph-keyring
|
|
mountPath: /tmp/client-keyring
|
|
subPath: key
|
|
readOnly: true
|
|
{{ end }}
|
|
{{- if eq .Values.storage "pvc" }}
|
|
- name: glance-images
|
|
mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }}
|
|
{{ end }}
|
|
volumes:
|
|
- name: glance-bin
|
|
configMap:
|
|
name: glance-bin
|
|
defaultMode: 0555
|
|
{{ if or (eq .Values.storage "rbd") (eq .Values.storage "radosgw") }}
|
|
- name: etcceph
|
|
emptyDir: {}
|
|
- name: ceph-etc
|
|
configMap:
|
|
name: ceph-etc
|
|
defaultMode: 0444
|
|
- name: ceph-keyring
|
|
secret:
|
|
secretName: pvc-ceph-client-key
|
|
{{ end }}
|
|
{{- if eq .Values.storage "pvc" }}
|
|
- name: glance-images
|
|
persistentVolumeClaim:
|
|
claimName: glance-images
|
|
{{ end }}
|
|
{{- end }}
|