From 13062e23e86b5d86020949754540460cb5b0b4fe Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Wed, 13 May 2015 06:46:24 -0500 Subject: Restructure builds to allow more flexibility As a restructure, nothing is changed from the original behaviour and naming despite the file structure changing. The symlinks to build had to be updated generating lots of "deleted" and "new_file". The new structure is: docker/${base_distro}/${type}/${container} base_distro == centos, ubuntu, fedora, etc type == source, binary, rdo type rdo is a symlink to binary for backwards compatibility Two new flags are added to the build-all script to support the ability to support different base distros and a flag to support binary or source containers. There are several added folders that are empty to hold the directory structure for future containers of these types. To use a prefix other than centos-rdo- you can set PREFIX in the toplevel directory .buildconf file Change-Id: Ifc7bac0d827470f506c8b5c004a833da9ce13b90 --- docker/centos/binary/cinder/Dockerfile | 8 ++ docker/centos/binary/cinder/build | 1 + docker/centos/binary/cinder/start.sh | 145 +++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+) create mode 100644 docker/centos/binary/cinder/Dockerfile create mode 120000 docker/centos/binary/cinder/build create mode 100755 docker/centos/binary/cinder/start.sh (limited to 'docker/centos/binary/cinder') diff --git a/docker/centos/binary/cinder/Dockerfile b/docker/centos/binary/cinder/Dockerfile new file mode 100644 index 000000000..3dd7eca59 --- /dev/null +++ b/docker/centos/binary/cinder/Dockerfile @@ -0,0 +1,8 @@ +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +RUN yum -y install openstack-cinder && yum clean all + +ADD ./start.sh /start.sh +CMD ["/start.sh"] + diff --git a/docker/centos/binary/cinder/build b/docker/centos/binary/cinder/build new file mode 120000 index 000000000..8d652f7ee --- /dev/null +++ b/docker/centos/binary/cinder/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/cinder/start.sh b/docker/centos/binary/cinder/start.sh new file mode 100755 index 000000000..c0d796f02 --- /dev/null +++ b/docker/centos/binary/cinder/start.sh @@ -0,0 +1,145 @@ +#!/bin/bash -e + +: ${CINDER_DB_USER:=cinder} +: ${CINDER_DB_NAME:=cinder} +: ${KEYSTONE_AUTH_PROTOCOL:=http} +: ${CINDER_KEYSTONE_USER:=cinder} +: ${ADMIN_TENANT_NAME:=admin} + +if ! [ "$CINDER_DB_PASSWORD" ]; then + CINDER_DB_PASSWORD=$(openssl rand -hex 15) + export CINDER_DB_PASSWORD +fi + +check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ + CINDER_ADMIN_PASSWORD +fail_unless_db + +mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" mysql <