aboutsummaryrefslogtreecommitdiff
path: root/docker/ceilometer/ceilometer-notification
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-05-13 06:46:24 -0500
committerSam Yaple <sam@yaple.net>2015-05-15 01:32:22 -0500
commit13062e23e86b5d86020949754540460cb5b0b4fe (patch)
treee0b3c8411418949a3d8df221da7c8cb2831b6d5d /docker/ceilometer/ceilometer-notification
parent354ba01c8f5c7e1695cbea3bfc07aee5b75e76d9 (diff)
downloadkolla-13062e23e86b5d86020949754540460cb5b0b4fe.tar.gz
kolla-13062e23e86b5d86020949754540460cb5b0b4fe.zip
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
Diffstat (limited to 'docker/ceilometer/ceilometer-notification')
-rw-r--r--docker/ceilometer/ceilometer-notification/Dockerfile7
l---------docker/ceilometer/ceilometer-notification/build1
-rw-r--r--docker/ceilometer/ceilometer-notification/start.sh9
3 files changed, 0 insertions, 17 deletions
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile b/docker/ceilometer/ceilometer-notification/Dockerfile
deleted file mode 100644
index 72d291bcb..000000000
--- a/docker/ceilometer/ceilometer-notification/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-RUN yum install -y openstack-ceilometer-notification && yum clean all
-
-ADD ./start.sh /start.sh
-CMD ["/start.sh"]
diff --git a/docker/ceilometer/ceilometer-notification/build b/docker/ceilometer/ceilometer-notification/build
deleted file mode 120000
index 43944faa0..000000000
--- a/docker/ceilometer/ceilometer-notification/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/ceilometer/ceilometer-notification/start.sh b/docker/ceilometer/ceilometer-notification/start.sh
deleted file mode 100644
index 939734549..000000000
--- a/docker/ceilometer/ceilometer-notification/start.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /opt/kolla/kolla-common.sh
-. /opt/kolla/config-ceilometer.sh
-
-
-exec /usr/bin/ceilometer-agent-notification