Cinder: Bring backup service inline with others for entrypoints

This PS brings the launch style of Cinder-Backup inline with other
OpenStack-Helm pods.

Change-Id: I6a1889037c1b57d370ea00d1044942164fffe5fc
This commit is contained in:
Pete Birley 2017-07-02 00:34:36 -05:00
parent 9797750fd2
commit 27c99560db
3 changed files with 27 additions and 4 deletions

View File

@ -0,0 +1,19 @@
#!/bin/bash
# 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.
set -ex
exec cinder-backup \
--config-file /etc/cinder/cinder.conf

View File

@ -31,6 +31,8 @@ data:
{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
cinder-api.sh: |
{{ tuple "bin/_cinder-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
cinder-backup.sh: |
{{ tuple "bin/_cinder-backup.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
cinder-scheduler.sh: |
{{ tuple "bin/_cinder-scheduler.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
cinder-volume.sh: |

View File

@ -73,14 +73,16 @@ spec:
cpu: {{ .Values.resources.cinder_backup.limits.cpu | quote }}
{{- end }}
command:
- cinder-backup
- --config-dir
- /etc/cinder/conf
- /tmp/cinder-backup.sh
volumeMounts:
- name: pod-var-cache-cinder
mountPath: /var/cache/cinder
- name: cinder-bin
mountPath: /tmp/cinder-backup.sh
subPath: cinder-backup.sh
readOnly: true
- name: cinder-etc
mountPath: /etc/cinder/conf/cinder.conf
mountPath: /etc/cinder/cinder.conf
subPath: cinder.conf
readOnly: true
{{- if eq .Values.conf.cinder.default.cinder.backup_driver "cinder.backup.drivers.ceph" }}