12 files changed, 151 insertions, 12 deletions
diff --git a/docker_templates/ceilometer/ceilometer-alarm/config-external.sh b/docker_templates/ceilometer/ceilometer-alarm/config-external.sh
index cbd2182d4..2835bd5aa 120000..100644
--- a/docker_templates/ceilometer/ceilometer-alarm/config-external.sh
+++ b/docker_templates/ceilometer/ceilometer-alarm/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/ceilometer/ceilometer-alarm/config-external.sh
-\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+TARGET="/etc/ceilometer/ceilometer.conf"
+OWNER="ceilometer"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/ceilometer/ceilometer-alarm/start.sh b/docker_templates/ceilometer/ceilometer-alarm/start.sh
index 3d7d88220..ab5501b23 120000..100755
--- a/docker_templates/ceilometer/ceilometer-alarm/start.sh
+++ b/docker_templates/ceilometer/ceilometer-alarm/start.sh
@@ -1 +1,14 @@
-../../../docker/common/ceilometer/ceilometer-alarm/start.sh
-\ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+
+CMD="/usr/bin/ceilometer-alarm"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/ceilometer/ceilometer-api/config-external.sh b/docker_templates/ceilometer/ceilometer-api/config-external.sh
index ba6e97d0a..2835bd5aa 120000..100644
--- a/docker_templates/ceilometer/ceilometer-api/config-external.sh
+++ b/docker_templates/ceilometer/ceilometer-api/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/ceilometer/ceilometer-api/config-external.sh
-\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+TARGET="/etc/ceilometer/ceilometer.conf"
+OWNER="ceilometer"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/ceilometer/ceilometer-api/start.sh b/docker_templates/ceilometer/ceilometer-api/start.sh
index 0ed8e50d7..0f660e025 120000..100755
--- a/docker_templates/ceilometer/ceilometer-api/start.sh
+++ b/docker_templates/ceilometer/ceilometer-api/start.sh
@@ -1 +1,21 @@
-../../../docker/common/ceilometer/ceilometer-api/start.sh
-\ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+
+CMD="/usr/bin/ceilometer-api"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Config-internal script exec out of this function, it does not return here.
+set_configs
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    su -s /bin/sh -c "ceilometer-manage db_sync" ceilometer
+    exit 0
+fi
+
+exec $CMD $ARGS
diff --git a/docker_templates/ceilometer/ceilometer-central/config-external.sh b/docker_templates/ceilometer/ceilometer-central/config-external.sh
index 4861720ed..2835bd5aa 120000..100644
--- a/docker_templates/ceilometer/ceilometer-central/config-external.sh
+++ b/docker_templates/ceilometer/ceilometer-central/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/ceilometer/ceilometer-central/config-external.sh
-\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+TARGET="/etc/ceilometer/ceilometer.conf"
+OWNER="ceilometer"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/ceilometer/ceilometer-central/start.sh b/docker_templates/ceilometer/ceilometer-central/start.sh
index 7826d17f4..f2980a4d5 120000..100755
--- a/docker_templates/ceilometer/ceilometer-central/start.sh
+++ b/docker_templates/ceilometer/ceilometer-central/start.sh
@@ -1 +1,14 @@
-../../../docker/common/ceilometer/ceilometer-central/start.sh
-\ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+
+CMD="/usr/bin/ceilometer-agent-central"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/ceilometer/ceilometer-collector/config-external.sh b/docker_templates/ceilometer/ceilometer-collector/config-external.sh
index 98cf686b0..2835bd5aa 120000..100644
--- a/docker_templates/ceilometer/ceilometer-collector/config-external.sh
+++ b/docker_templates/ceilometer/ceilometer-collector/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/ceilometer/ceilometer-collector/config-external.sh
-\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+TARGET="/etc/ceilometer/ceilometer.conf"
+OWNER="ceilometer"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/ceilometer/ceilometer-collector/start.sh b/docker_templates/ceilometer/ceilometer-collector/start.sh
index a00030fdb..3a59c17d1 120000..100755
--- a/docker_templates/ceilometer/ceilometer-collector/start.sh
+++ b/docker_templates/ceilometer/ceilometer-collector/start.sh
@@ -1 +1,14 @@
-../../../docker/common/ceilometer/ceilometer-collector/start.sh
-\ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+
+CMD="/usr/bin/ceilometer-collector"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/ceilometer/ceilometer-compute/config-external.sh b/docker_templates/ceilometer/ceilometer-compute/config-external.sh
index 5658fb7d8..2835bd5aa 120000..100644
--- a/docker_templates/ceilometer/ceilometer-compute/config-external.sh
+++ b/docker_templates/ceilometer/ceilometer-compute/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/ceilometer/ceilometer-compute/config-external.sh
-\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+TARGET="/etc/ceilometer/ceilometer.conf"
+OWNER="ceilometer"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/ceilometer/ceilometer-compute/start.sh b/docker_templates/ceilometer/ceilometer-compute/start.sh
index 42e2494f2..19d90be2f 120000..100755
--- a/docker_templates/ceilometer/ceilometer-compute/start.sh
+++ b/docker_templates/ceilometer/ceilometer-compute/start.sh
@@ -1 +1,14 @@
-../../../docker/common/ceilometer/ceilometer-compute/start.sh
-\ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+
+CMD="/usr/bin/ceilometer-agent-compute"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/ceilometer/ceilometer-notification/config-external.sh b/docker_templates/ceilometer/ceilometer-notification/config-external.sh
index 9834f0cc1..2835bd5aa 120000..100644
--- a/docker_templates/ceilometer/ceilometer-notification/config-external.sh
+++ b/docker_templates/ceilometer/ceilometer-notification/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/ceilometer/ceilometer-notification/config-external.sh
-\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
+TARGET="/etc/ceilometer/ceilometer.conf"
+OWNER="ceilometer"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/ceilometer/ceilometer-notification/start.sh b/docker_templates/ceilometer/ceilometer-notification/start.sh
index a97606851..8ce4b4488 120000..100755
--- a/docker_templates/ceilometer/ceilometer-notification/start.sh
+++ b/docker_templates/ceilometer/ceilometer-notification/start.sh
@@ -1 +1,14 @@
-../../../docker/common/ceilometer/ceilometer-notification/start.sh
-\ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+
+CMD="/usr/bin/ceilometer-agent-notification"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS