openstack/kolla-ansible
Code Issues Proposed changes

WIP: Remove data containers and adjust compose files

Browse Source 
Remove all data containers from the repository except the one image
we intend to reuse for each data container.  Adjust compose files to
remove all references to the unique data containers which serve no
purpose other then to take up extra resources.

Needs VOLUME in data containers exported in the compose files.

Change-Id: Id7746110946ef9836180cf57302aaf827e7e5405
Partially-Implements: blueprint one-data-container
This commit is contained in:
Steven Dake 2015-08-13 15:55:13 -07:00
parent 44aa4af5f5
commit f1dbf25797
33 changed files with 11 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/cinder-volume.yml
View File

@ -1,5 +1,5 @@
cinderdata:
image: kollaglue/centos-rdo-cinder-data:latest
image: kollaglue/centos-rdo-data:latest
name: cinderdata
restart: on-failure

2
compose/designate.yml
View File

@ -28,7 +28,7 @@ designatepoolmanager:
# Bind9 backend and state storage.
designatebackendbind9data:
image: kollaglue/centos-rdo-designate-backend-bind9-data:latest
image: kollaglue/centos-rdo-data:latest
name: designate-backend-bind9-data
restart: on-failure

4
compose/galeradb.yml
View File

@ -1,5 +1,5 @@
galeradbdata:
image: kollaglue/centos-rdo-mariadb-data:latest
image: kollaglue/centos-rdo-data:latest
name: galeradb-data
restart: on-failure
@ -12,4 +12,4 @@ galeraapp:
env_file:
- openstack.env
volumes_from:
- galeradbdata
- galeradbdata

2
compose/glance-api-registry.yml
View File

@ -9,6 +9,8 @@ glanceregistry:
restart: always
env_file:
- openstack.env
volumes_from:
- glancedata
glanceapi:
image: kollaglue/centos-rdo-glance-api:latest

2
compose/mariadb.yml
View File

@ -1,5 +1,5 @@
mariadbdata:
image: kollaglue/centos-rdo-mariadb-data:latest
image: kollaglue/centos-rdo-data:latest
name: mariadbdata
restart: on-failure

2
compose/nova-api-compute-network.yml
View File

@ -1,5 +1,5 @@
computedata:
image: kollaglue/centos-rdo-nova-compute-data:latest
image: kollaglue/centos-rdo-data:latest
name: computedata
libvirt:

2
compose/nova-compute-network.yml
View File

@ -1,5 +1,5 @@
computedata:
image: kollaglue/centos-rdo-nova-compute-data:latest
image: kollaglue/centos-rdo-data:latest
name: computedata
libvirt:

2
compose/nova-compute.yml
View File

@ -1,5 +1,5 @@
computedata:
image: kollaglue/centos-rdo-nova-compute-data:latest
image: kollaglue/centos-rdo-data:latest
name: computedata
libvirt:

2
compose/swift-storage.yml
View File

@ -1,5 +1,5 @@
swiftdata:
image: kollaglue/centos-rdo-swift-data:latest
image: kollaglue/centos-rdo-data:latest
name: swiftdata
swiftobjectserver:

9
docker/centos/binary/cinder/cinder-data/Dockerfile
View File

@ -1,9 +0,0 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/data
VOLUME [ "/opt/data" ]
# Command needed to start the data container.
# Note: data containers do not need to be persistent.
CMD ["/bin/true"]

1
docker/centos/binary/cinder/cinder-data/build
View File

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

6
docker/centos/binary/designate/designate-backend-bind9-data/Dockerfile
View File

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

1
docker/centos/binary/designate/designate-backend-bind9-data/build
View File

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

5
docker/centos/binary/glance/glance-data/Dockerfile
View File

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

1
docker/centos/binary/glance/glance-data/build
View File

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

10
docker/centos/binary/nova/nova-compute-data/Dockerfile
View File

@ -1,10 +0,0 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
VOLUME [ "/var/lib/nova" ]
VOLUME [ "/var/lib/libvirt" ]
VOLUME [ "/etc/libvirt/qemu" ]
# Command needed to start the data container.
# Note: data containers do not need to be persistent.
CMD ["/bin/true"]

1
docker/centos/binary/nova/nova-compute-data/build
View File

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

13
docker/centos/binary/swift/swift-data/Dockerfile
View File

@ -1,13 +0,0 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# NOTE(pbourke): This is emulating the Swift "all-in-one" setups where there are 3 disks/partitions
# on which to mirror data. This is extremely inefficient and is really only to prove everything
# works in an AIO setup. For production deploys the Ansible provisioned setup should be used.
VOLUME [ "/srv/node/sdb1" ]
VOLUME [ "/srv/node/sdb2" ]
VOLUME [ "/srv/node/sdb3" ]
# Command needed to start the data container.
# Note: data containers do not need to be persistent.
CMD ["/bin/true"]

1
docker/centos/binary/swift/swift-data/build
View File

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

9
docker/centos/source/cinder/cinder-data/Dockerfile
View File

@ -1,9 +0,0 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/data
VOLUME [ "/opt/data" ]
# Command needed to start the data container.
# Note: data containers do not need to be persistent.
CMD ["/bin/true"]

1
docker/centos/source/cinder/cinder-data/build
View File

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

6
docker/centos/source/designate/designate-backend-bind9-data/Dockerfile
View File

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

1
docker/centos/source/designate/designate-backend-bind9-data/build
View File

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

5
docker/centos/source/glance/glance-data/Dockerfile
View File

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

1
docker/centos/source/glance/glance-data/build
View File

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

10
docker/centos/source/nova/nova-compute-data/Dockerfile
View File

@ -1,10 +0,0 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
VOLUME [ "/var/lib/nova" ]
VOLUME [ "/var/lib/libvirt" ]
VOLUME [ "/etc/libvirt/qemu" ]
# Command needed to start the data container.
# Note: data containers do not need to be persistent.
CMD ["/bin/true"]

1
docker/centos/source/nova/nova-compute-data/build
View File

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

13
docker/centos/source/swift/swift-data/Dockerfile
View File

@ -1,13 +0,0 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# NOTE(pbourke): This is emulating the Swift "all-in-one" setups where there are 3 disks/partitions
# on which to mirror data. This is extremely inefficient and is really only to prove everything
# works in an AIO setup. For production deploys the Ansible provisioned setup should be used.
VOLUME [ "/srv/node/sdb1" ]
VOLUME [ "/srv/node/sdb2" ]
VOLUME [ "/srv/node/sdb3" ]
# Command needed to start the data container.
# Note: data containers do not need to be persistent.
CMD ["/bin/true"]

1
docker/centos/source/swift/swift-data/build
View File

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

9
docker_templates/cinder/cinder-data/Dockerfile.j2
View File

@ -1,9 +0,0 @@
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-cinder-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/data
VOLUME [ "/opt/data" ]
# Command needed to start the data container.
# Note: data containers do not need to be persistent.
CMD ["/bin/true"]

1
docker_templates/cinder/cinder-data/build
View File

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

6
docker_templates/designate/designate-backend-bind9-data/Dockerfile.j2
View File

@ -1,6 +0,0 @@
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net.kolla)
VOLUME [ "/var/named" ]
CMD [ "/bin/true" ]

13
docker_templates/swift/swift-data/Dockerfile.j2
View File

@ -1,13 +0,0 @@
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net.kolla)
# NOTE(pbourke): This is emulating the Swift "all-in-one" setups where there are 3 disks/partitions
# on which to mirror data. This is extremely inefficient and is really only to prove everything
# works in an AIO setup. For production deploys the Ansible provisioned setup should be used.
VOLUME [ "/srv/node/sdb1" ]
VOLUME [ "/srv/node/sdb2" ]
VOLUME [ "/srv/node/sdb3" ]
# Command needed to start the data container.
# Note: data containers do not need to be persistent.
CMD ["/bin/true"]