Merge "Add cinder backup service"
This commit is contained in:
commit
445083f0c6
|
@ -0,0 +1,4 @@
|
|||
FROM {{ image_spec("cinder-ceph") }}
|
||||
MAINTAINER {{ maintainer }}
|
||||
|
||||
USER cinder
|
|
@ -0,0 +1,14 @@
|
|||
FROM {{ image_spec("cinder-base") }}
|
||||
MAINTAINER {{ maintainer }}
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends qemu-utils ceph-common python-ceph python-rados \
|
||||
&& apt-get clean \
|
||||
&& mkdir -p /etc/ceph \
|
||||
&& chown -R cinder: /etc/ceph \
|
||||
&& ln -s /usr/lib/python2.7/dist-packages/rados.so /var/lib/microservices/venv/local/lib/python2.7/site-packages/rados.so \
|
||||
&& ln -s /usr/lib/python2.7/dist-packages/rados-0.egg-info /var/lib/microservices/venv/local/lib/python2.7/site-packages/rados-0.egg-info \
|
||||
&& ln -s /usr/lib/python2.7/dist-packages/rbd-0.egg-info /var/lib/microservices/venv/local/lib/python2.7/site-packages/rbd-0.egg-info \
|
||||
&& ln -s /usr/lib/python2.7/dist-packages/rbd.so /var/lib/microservices/venv/local/lib/python2.7/site-packages/rbd.so
|
||||
|
||||
USER cinder
|
|
@ -1,14 +1,4 @@
|
|||
FROM {{ image_spec("cinder-base") }}
|
||||
FROM {{ image_spec("cinder-ceph") }}
|
||||
MAINTAINER {{ maintainer }}
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends qemu-utils ceph-common python-ceph python-rados \
|
||||
&& apt-get clean \
|
||||
&& mkdir -p /etc/ceph \
|
||||
&& chown -R cinder: /etc/ceph \
|
||||
&& ln -s /usr/lib/python2.7/dist-packages/rados.so /var/lib/microservices/venv/local/lib/python2.7/site-packages/rados.so \
|
||||
&& ln -s /usr/lib/python2.7/dist-packages/rados-0.egg-info /var/lib/microservices/venv/local/lib/python2.7/site-packages/rados-0.egg-info \
|
||||
&& ln -s /usr/lib/python2.7/dist-packages/rbd-0.egg-info /var/lib/microservices/venv/local/lib/python2.7/site-packages/rbd-0.egg-info \
|
||||
&& ln -s /usr/lib/python2.7/dist-packages/rbd.so /var/lib/microservices/venv/local/lib/python2.7/site-packages/rbd.so
|
||||
|
||||
USER cinder
|
||||
|
|
|
@ -0,0 +1,30 @@
|
|||
dsl_version: 0.1.0
|
||||
service:
|
||||
name: cinder-backup
|
||||
containers:
|
||||
- name: cinder-backup
|
||||
image: cinder-backup
|
||||
daemon:
|
||||
command: cinder-backup --config-file /etc/cinder/cinder.conf --config-file /etc/cinder/cinder-backup.conf
|
||||
files:
|
||||
- cinder-conf
|
||||
- cinder-backup-conf
|
||||
# {% if cinder.ceph.enable %}
|
||||
- ceph-conf
|
||||
- cinder-ceph-key
|
||||
# {% endif %}
|
||||
dependencies:
|
||||
- cinder-api
|
||||
files:
|
||||
cinder-conf:
|
||||
path: /etc/cinder/cinder.conf
|
||||
content: cinder.conf.j2
|
||||
cinder-backup-conf:
|
||||
path: /etc/cinder/cinder-backup.conf
|
||||
content: cinder-backup.conf.j2
|
||||
ceph-conf:
|
||||
path: /etc/ceph/ceph.conf
|
||||
content: ceph.conf.j2
|
||||
cinder-ceph-key:
|
||||
path: /etc/ceph/ceph.client.cinder.keyring
|
||||
content: ceph.client.cinder.keyring.j2
|
|
@ -0,0 +1,8 @@
|
|||
[DEFAULT]
|
||||
|
||||
{% if cinder.backup_driver == "ceph" %}
|
||||
backup_driver = cinder.backup.drivers.ceph
|
||||
backup_ceph_conf = /etc/ceph/ceph.conf
|
||||
backup_ceph_pool = {{ cinder.ceph.backup_pool_name }}
|
||||
backup_ceph_user = {{ cinder.ceph.username }}
|
||||
{% endif %}
|
|
@ -18,9 +18,11 @@ configs:
|
|||
key: "Changeme"
|
||||
username: "cinder"
|
||||
pool_name: "volumes"
|
||||
backup_pool_name: "backup"
|
||||
backup_pool_name: "backups"
|
||||
rbd_secret_uuid: "Changeme"
|
||||
|
||||
backup_driver: ceph
|
||||
|
||||
sources:
|
||||
openstack/cinder:
|
||||
git_url: https://github.com/openstack/cinder.git
|
||||
|
|
Loading…
Reference in New Issue