diff --git a/cinder_controller/Dockerfile b/cinder_controller/Dockerfile index 0a8f0da..3406a1f 100644 --- a/cinder_controller/Dockerfile +++ b/cinder_controller/Dockerfile @@ -15,6 +15,8 @@ RUN set -x \ python-oslo.cache \ cinder-api \ cinder-scheduler \ + python-ceph \ + python-rbd \ && apt-get -y clean EXPOSE 8776 diff --git a/cinder_controller/write_conf.sh b/cinder_controller/write_conf.sh index 713a91c..2f94221 100755 --- a/cinder_controller/write_conf.sh +++ b/cinder_controller/write_conf.sh @@ -11,6 +11,7 @@ connection = mysql+pymysql://$CINDER_USER:$CINDER_PASSWORD@$MYSQL_HOST/cinder [DEFAULT] auth_strategy = keystone transport_url = rabbit://$RABBIT_USER:$RABBIT_PASSWORD@$MY_IP +enabled_backends = RBD-backend my_ip = $MY_IP [keystone_authtoken] @@ -27,4 +28,12 @@ password = $CINDER_PASSWORD [oslo_concurrency] lock_path = /var/lib/cinder/tmp +[RBD-backend] +volume_backend_name = RBD-backend +rbd_pool = volumes +rbd_user = volumes +rbd_secret_uuid = $RBD_SECRET_UUID +volume_driver = cinder.volume.drivers.rbd.RBDDriver +rbd_ceph_conf = /etc/ceph/ceph.conf + EOF diff --git a/cinder_storage/Dockerfile b/cinder_storage/Dockerfile index 1b10932..86224df 100644 --- a/cinder_storage/Dockerfile +++ b/cinder_storage/Dockerfile @@ -15,7 +15,7 @@ RUN set -x \ python-openstackclient \ python-oslo.cache \ lvm2 \ - python-ceph \ + python-ceph \ python-rbd \ && apt-get -y clean