diff options
| author | Ian Main <imain@redhat.com> | 2015-06-15 16:48:35 -0400 |
|---|---|---|
| committer | Ian Main <imain@redhat.com> | 2015-06-18 13:48:22 -0400 |
| commit | 2482f718f840dbea42f4c452238c5b096e1fd6b4 (patch) | |
| tree | 6813772e0dcaad03bde255f3dcc99bc8e0bac45d | |
| parent | 0c5d6575ed7eb86886ae9e7e6ec693616db938d3 (diff) | |
| download | kolla-2482f718f840dbea42f4c452238c5b096e1fd6b4.tar.gz kolla-2482f718f840dbea42f4c452238c5b096e1fd6b4.zip | |
Set up glance to use a data container.
Glance images were originally intended to be stored on the host (see
container Dockerfile) but the compose file was not doing this. The
right thing is to use a data container for image content.
Closes-bug: #1465401
Change-Id: I02d2aab2913356939d98b8c18f9e788ae6d901af
Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
| -rw-r--r-- | compose/glance-api-registry.yml | 7 | ||||
| -rw-r--r-- | docker/centos/binary/glance/glance-api/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/glance/glance-data/Dockerfile | 5 | ||||
| l--------- | docker/glance/glance-data/build | 1 |
4 files changed, 13 insertions, 2 deletions
diff --git a/compose/glance-api-registry.yml b/compose/glance-api-registry.yml index 2acb4c361..b931b5bb1 100644 --- a/compose/glance-api-registry.yml +++ b/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 diff --git a/docker/centos/binary/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile index a4bd45bd1..5ff83508f 100644 --- a/docker/centos/binary/glance/glance-api/Dockerfile +++ b/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 diff --git a/docker/glance/glance-data/Dockerfile b/docker/glance/glance-data/Dockerfile new file mode 100644 index 000000000..e99c60eca --- /dev/null +++ b/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"] diff --git a/docker/glance/glance-data/build b/docker/glance/glance-data/build new file mode 120000 index 000000000..43944faa0 --- /dev/null +++ b/docker/glance/glance-data/build @@ -0,0 +1 @@ +../../../tools/build-docker-image
\ No newline at end of file |