From 8930c12922509a52c6ef8d0475ca5adefb61ea27 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 27 Aug 2015 17:28:40 -0700 Subject: Move scripts for ceilometer to docker_templates Change-Id: I4b4707b2d30175fcb93836edbe02c154a211c116 Partially-Implements: blueprint remove-docker-dir --- .../ceilometer/ceilometer-alarm/config-external.sh | 10 ---------- docker/common/ceilometer/ceilometer-alarm/start.sh | 14 -------------- .../ceilometer/ceilometer-api/config-external.sh | 10 ---------- docker/common/ceilometer/ceilometer-api/start.sh | 21 --------------------- .../ceilometer-central/config-external.sh | 10 ---------- .../common/ceilometer/ceilometer-central/start.sh | 14 -------------- .../ceilometer-collector/config-external.sh | 10 ---------- .../common/ceilometer/ceilometer-collector/start.sh | 14 -------------- .../ceilometer-compute/config-external.sh | 10 ---------- .../common/ceilometer/ceilometer-compute/start.sh | 14 -------------- .../ceilometer-notification/config-external.sh | 10 ---------- .../ceilometer/ceilometer-notification/start.sh | 14 -------------- 12 files changed, 151 deletions(-) delete mode 100644 docker/common/ceilometer/ceilometer-alarm/config-external.sh delete mode 100755 docker/common/ceilometer/ceilometer-alarm/start.sh delete mode 100644 docker/common/ceilometer/ceilometer-api/config-external.sh delete mode 100755 docker/common/ceilometer/ceilometer-api/start.sh delete mode 100644 docker/common/ceilometer/ceilometer-central/config-external.sh delete mode 100755 docker/common/ceilometer/ceilometer-central/start.sh delete mode 100644 docker/common/ceilometer/ceilometer-collector/config-external.sh delete mode 100755 docker/common/ceilometer/ceilometer-collector/start.sh delete mode 100644 docker/common/ceilometer/ceilometer-compute/config-external.sh delete mode 100755 docker/common/ceilometer/ceilometer-compute/start.sh delete mode 100644 docker/common/ceilometer/ceilometer-notification/config-external.sh delete mode 100755 docker/common/ceilometer/ceilometer-notification/start.sh (limited to 'docker') diff --git a/docker/common/ceilometer/ceilometer-alarm/config-external.sh b/docker/common/ceilometer/ceilometer-alarm/config-external.sh deleted file mode 100644 index 2835bd5aa..000000000 --- a/docker/common/ceilometer/ceilometer-alarm/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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-alarm/start.sh b/docker/common/ceilometer/ceilometer-alarm/start.sh deleted file mode 100755 index ab5501b23..000000000 --- a/docker/common/ceilometer/ceilometer-alarm/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/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/common/ceilometer/ceilometer-api/config-external.sh b/docker/common/ceilometer/ceilometer-api/config-external.sh deleted file mode 100644 index 2835bd5aa..000000000 --- a/docker/common/ceilometer/ceilometer-api/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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-api/start.sh b/docker/common/ceilometer/ceilometer-api/start.sh deleted file mode 100755 index 0f660e025..000000000 --- a/docker/common/ceilometer/ceilometer-api/start.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/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/common/ceilometer/ceilometer-central/config-external.sh b/docker/common/ceilometer/ceilometer-central/config-external.sh deleted file mode 100644 index 2835bd5aa..000000000 --- a/docker/common/ceilometer/ceilometer-central/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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-central/start.sh b/docker/common/ceilometer/ceilometer-central/start.sh deleted file mode 100755 index f2980a4d5..000000000 --- a/docker/common/ceilometer/ceilometer-central/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/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/common/ceilometer/ceilometer-collector/config-external.sh b/docker/common/ceilometer/ceilometer-collector/config-external.sh deleted file mode 100644 index 2835bd5aa..000000000 --- a/docker/common/ceilometer/ceilometer-collector/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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-collector/start.sh b/docker/common/ceilometer/ceilometer-collector/start.sh deleted file mode 100755 index 3a59c17d1..000000000 --- a/docker/common/ceilometer/ceilometer-collector/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/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/common/ceilometer/ceilometer-compute/config-external.sh b/docker/common/ceilometer/ceilometer-compute/config-external.sh deleted file mode 100644 index 2835bd5aa..000000000 --- a/docker/common/ceilometer/ceilometer-compute/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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-compute/start.sh b/docker/common/ceilometer/ceilometer-compute/start.sh deleted file mode 100755 index 19d90be2f..000000000 --- a/docker/common/ceilometer/ceilometer-compute/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/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/common/ceilometer/ceilometer-notification/config-external.sh b/docker/common/ceilometer/ceilometer-notification/config-external.sh deleted file mode 100644 index 2835bd5aa..000000000 --- a/docker/common/ceilometer/ceilometer-notification/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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/start.sh b/docker/common/ceilometer/ceilometer-notification/start.sh deleted file mode 100755 index 8ce4b4488..000000000 --- a/docker/common/ceilometer/ceilometer-notification/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 -- cgit v1.2.3