aboutsummaryrefslogtreecommitdiff
path: root/docker/common/ceilometer/ceilometer-notification
diff options
context:
space:
mode:
Diffstat (limited to 'docker/common/ceilometer/ceilometer-notification')
-rw-r--r--docker/common/ceilometer/ceilometer-notification/config-external.sh10
-rw-r--r--docker/common/ceilometer/ceilometer-notification/config-internal.sh9
-rw-r--r--docker/common/ceilometer/ceilometer-notification/start.sh13
3 files changed, 28 insertions, 4 deletions
diff --git a/docker/common/ceilometer/ceilometer-notification/config-external.sh b/docker/common/ceilometer/ceilometer-notification/config-external.sh
new file mode 100644
index 000000000..2835bd5aa
--- /dev/null
+++ b/docker/common/ceilometer/ceilometer-notification/config-external.sh
@@ -0,0 +1,10 @@
+#!/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/common/ceilometer/ceilometer-notification/config-internal.sh b/docker/common/ceilometer/ceilometer-notification/config-internal.sh
new file mode 100644
index 000000000..939734549
--- /dev/null
+++ b/docker/common/ceilometer/ceilometer-notification/config-internal.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+. /opt/kolla/kolla-common.sh
+. /opt/kolla/config-ceilometer.sh
+
+
+exec /usr/bin/ceilometer-agent-notification
diff --git a/docker/common/ceilometer/ceilometer-notification/start.sh b/docker/common/ceilometer/ceilometer-notification/start.sh
index 939734549..1fc97ff21 100644
--- a/docker/common/ceilometer/ceilometer-notification/start.sh
+++ b/docker/common/ceilometer/ceilometer-notification/start.sh
@@ -1,9 +1,14 @@
#!/bin/bash
-set -e
+set -o errexit
-. /opt/kolla/kolla-common.sh
-. /opt/kolla/config-ceilometer.sh
+CMD="/usr/bin/ceilometer-agent-notification"
+ARGS=""
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
-exec /usr/bin/ceilometer-agent-notification
+# Config-internal script exec out of this function, it does not return here.
+set_configs
+
+exec $CMD $ARGS