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/ceilometer/ceilometer-base/Dockerfile | 5 -- docker/ceilometer/ceilometer-base/build | 1 - .../ceilometer-base/config-ceilometer.sh | 71 ---------------------- 3 files changed, 77 deletions(-) delete mode 100644 docker/ceilometer/ceilometer-base/Dockerfile delete mode 120000 docker/ceilometer/ceilometer-base/build delete mode 100644 docker/ceilometer/ceilometer-base/config-ceilometer.sh (limited to 'docker/ceilometer/ceilometer-base') diff --git a/docker/ceilometer/ceilometer-base/Dockerfile b/docker/ceilometer/ceilometer-base/Dockerfile deleted file mode 100644 index 6aaf77ab2..000000000 --- a/docker/ceilometer/ceilometer-base/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN mkdir -p /opt/kolla -COPY config-ceilometer.sh /opt/kolla/config-ceilometer.sh diff --git a/docker/ceilometer/ceilometer-base/build b/docker/ceilometer/ceilometer-base/build deleted file mode 120000 index 43944faa0..000000000 --- a/docker/ceilometer/ceilometer-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/ceilometer/ceilometer-base/config-ceilometer.sh deleted file mode 100644 index a2316dcd1..000000000 --- a/docker/ceilometer/ceilometer-base/config-ceilometer.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - -set -e -. /opt/kolla/kolla-common.sh - -: ${CEILOMETER_DB_USER:=ceilometer} -: ${CEILOMETER_DB_NAME:=ceilometer} -: ${KEYSTONE_AUTH_PROTOCOL:=http} -: ${CEILOMETER_KEYSTONE_USER:=admin} -: ${CEILOMETER_ADMIN_PASSWORD:=kolla} -: ${ADMIN_TENANT_NAME:=admin} -: ${METERING_SECRET:=ceilometer} -: ${RABBIT_PASSWORD:=guest} - -check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ - KEYSTONE_ADMIN_SERVICE_PORT KEYSTONE_PUBLIC_SERVICE_HOST \ -dump_vars - -cat > /openrc <