All changes in the merlin branches.

This commit is contained in:
Egon Rijpkema
2018-04-23 15:07:18 +02:00
parent b6c6533824
commit 791595dcdf
11 changed files with 109 additions and 58 deletions

View File

@ -14,6 +14,8 @@ RUN set -x \
python-mysqldb \
python-openstackclient \
python-oslo.cache \
python-rbd \
python-ceph \
&& apt-get -y clean \
&& rm -f /var/lib/glance/glance.sqlite

View File

@ -32,13 +32,14 @@ flavor = keystone
[glance_store]
stores = file,http
default_store = file
filesystem_store_datadir = /var/lib/glance/images/
stores = glance.store.rbd.Store
default_store = rbd
rbd_store_pool = images
rbd_store_user = images
rbd_store_ceph_conf = /etc/ceph/ceph.conf
EOF
cat << EOF > /etc/glance/glance-registry.conf
[DEFAULT]
@ -49,9 +50,11 @@ rpc_backend = rabbit
connection = mysql+pymysql://$GLANCE_USER:$GLANCE_PASSWORD@$MYSQL_HOST/glance
[glance_store]
stores = file,http
default_store = file
filesystem_store_datadir = /var/lib/glance/images/
stores = glance.store.rbd.Store
default_store = rbd
rbd_store_pool = images
rbd_store_user = images
rbd_store_ceph_conf = /etc/ceph/ceph.conf
[keystone_authtoken]
auth_uri = http://$KEYSTONE_HOST:5000