Merge "Set up glance to use a data container."

compose/glance-api-registry.yml

@@ -1,3 +1,7 @@
+glancedata:
+   image: kollaglue/centos-rdo-glance-data:latest
+   name: glance-data
+
 glanceregistry:
   image: kollaglue/centos-rdo-glance-registry:latest
   name: glance-registry
@@ -5,6 +9,7 @@ glanceregistry:
   restart: always
   env_file:
    - openstack.env
+
 glanceapi:
   image: kollaglue/centos-rdo-glance-api:latest
   name: glance-api
@@ -12,3 +17,5 @@ glanceapi:
   restart: always
   env_file:
    - openstack.env
+  volumes_from:
+   - glancedata

docker/centos/binary/glance/glance-api/Dockerfile

@@ -1,8 +1,6 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-VOLUME /var/lib/glance
-
 ADD ./start.sh /start.sh
 ADD ./check.sh /check.sh
 

docker/glance/glance-data/Dockerfile

@@ -0,0 +1,5 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+VOLUME [ "/var/lib/glance" ]
+CMD ["/bin/true"]

docker/glance/glance-data/build

@@ -0,0 +1 @@
+../../../tools/build-docker-image