diff --git a/docker/common/designate/designate-api/config-external.sh b/docker/common/designate/designate-api/config-external.sh deleted file mode 100644 index ce302ea0c5..0000000000 --- a/docker/common/designate/designate-api/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/designate/designate.conf" -TARGET="/etc/designate/designate.conf" -OWNER="designate" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/designate/designate-api/start.sh b/docker/common/designate/designate-api/start.sh deleted file mode 100755 index fe556225bb..0000000000 --- a/docker/common/designate/designate-api/start.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -set -o errexit -CMD="/usr/bin/designate-api" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -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 "designate-manage db_sync" designate - exit 0 -fi - -exec $CMD $ARGS diff --git a/docker/common/designate/designate-backend-bind9/config-external.sh b/docker/common/designate/designate-backend-bind9/config-external.sh deleted file mode 100644 index ce302ea0c5..0000000000 --- a/docker/common/designate/designate-backend-bind9/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/designate/designate.conf" -TARGET="/etc/designate/designate.conf" -OWNER="designate" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/designate/designate-backend-bind9/start.sh b/docker/common/designate/designate-backend-bind9/start.sh deleted file mode 100755 index 11922974a1..0000000000 --- a/docker/common/designate/designate-backend-bind9/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -o errexit -CMD="/usr/sbin/named" -ARGS="-u named -g" - -# Execute config strategy -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/designate/designate-central/config-external.sh b/docker/common/designate/designate-central/config-external.sh deleted file mode 100644 index ce302ea0c5..0000000000 --- a/docker/common/designate/designate-central/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/designate/designate.conf" -TARGET="/etc/designate/designate.conf" -OWNER="designate" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/designate/designate-central/start.sh b/docker/common/designate/designate-central/start.sh deleted file mode 100755 index eac012d3d2..0000000000 --- a/docker/common/designate/designate-central/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -o errexit -CMD="/usr/bin/designate-central" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/designate/designate-mdns/config-external.sh b/docker/common/designate/designate-mdns/config-external.sh deleted file mode 100644 index ce302ea0c5..0000000000 --- a/docker/common/designate/designate-mdns/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/designate/designate.conf" -TARGET="/etc/designate/designate.conf" -OWNER="designate" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/designate/designate-mdns/start.sh b/docker/common/designate/designate-mdns/start.sh deleted file mode 100755 index b4bcda20cd..0000000000 --- a/docker/common/designate/designate-mdns/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -o errexit -CMD="/usr/bin/designate-mdns" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/designate/designate-poolmanager/config-external.sh b/docker/common/designate/designate-poolmanager/config-external.sh deleted file mode 100644 index ce302ea0c5..0000000000 --- a/docker/common/designate/designate-poolmanager/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/designate/designate.conf" -TARGET="/etc/designate/designate.conf" -OWNER="designate" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/designate/designate-poolmanager/start.sh b/docker/common/designate/designate-poolmanager/start.sh deleted file mode 100755 index 0752b9847c..0000000000 --- a/docker/common/designate/designate-poolmanager/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -o errexit -CMD="/usr/bin/designate-pool-manager" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/designate/designate-sink/config-external.sh b/docker/common/designate/designate-sink/config-external.sh deleted file mode 100644 index ce302ea0c5..0000000000 --- a/docker/common/designate/designate-sink/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/designate/designate.conf" -TARGET="/etc/designate/designate.conf" -OWNER="designate" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/designate/designate-sink/start.sh b/docker/common/designate/designate-sink/start.sh deleted file mode 100755 index d2f93e26fc..0000000000 --- a/docker/common/designate/designate-sink/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -o errexit -CMD="/usr/bin/designate-sink" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker_templates/designate/designate-api/config-external.sh b/docker_templates/designate/designate-api/config-external.sh deleted file mode 120000 index 1dbb444c72..0000000000 --- a/docker_templates/designate/designate-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/designate/designate-api/config-external.sh \ No newline at end of file diff --git a/docker_templates/designate/designate-api/config-external.sh b/docker_templates/designate/designate-api/config-external.sh new file mode 100644 index 0000000000..ce302ea0c5 --- /dev/null +++ b/docker_templates/designate/designate-api/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/designate/designate.conf" +TARGET="/etc/designate/designate.conf" +OWNER="designate" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/designate/designate-api/start.sh b/docker_templates/designate/designate-api/start.sh deleted file mode 120000 index b216331468..0000000000 --- a/docker_templates/designate/designate-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/designate/designate-api/start.sh \ No newline at end of file diff --git a/docker_templates/designate/designate-api/start.sh b/docker_templates/designate/designate-api/start.sh new file mode 100755 index 0000000000..fe556225bb --- /dev/null +++ b/docker_templates/designate/designate-api/start.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +set -o errexit +CMD="/usr/bin/designate-api" +ARGS="" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +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 "designate-manage db_sync" designate + exit 0 +fi + +exec $CMD $ARGS diff --git a/docker_templates/designate/designate-backend-bind9/config-external.sh b/docker_templates/designate/designate-backend-bind9/config-external.sh deleted file mode 120000 index a6b9418b76..0000000000 --- a/docker_templates/designate/designate-backend-bind9/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/designate/designate-backend-bind9/config-external.sh \ No newline at end of file diff --git a/docker_templates/designate/designate-backend-bind9/config-external.sh b/docker_templates/designate/designate-backend-bind9/config-external.sh new file mode 100644 index 0000000000..ce302ea0c5 --- /dev/null +++ b/docker_templates/designate/designate-backend-bind9/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/designate/designate.conf" +TARGET="/etc/designate/designate.conf" +OWNER="designate" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/designate/designate-backend-bind9/start.sh b/docker_templates/designate/designate-backend-bind9/start.sh deleted file mode 120000 index df9938517e..0000000000 --- a/docker_templates/designate/designate-backend-bind9/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/designate/designate-backend-bind9/start.sh \ No newline at end of file diff --git a/docker_templates/designate/designate-backend-bind9/start.sh b/docker_templates/designate/designate-backend-bind9/start.sh new file mode 100755 index 0000000000..11922974a1 --- /dev/null +++ b/docker_templates/designate/designate-backend-bind9/start.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -o errexit +CMD="/usr/sbin/named" +ARGS="-u named -g" + +# Execute config strategy +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +exec $CMD $ARGS diff --git a/docker_templates/designate/designate-central/config-external.sh b/docker_templates/designate/designate-central/config-external.sh deleted file mode 120000 index ec5f415dfa..0000000000 --- a/docker_templates/designate/designate-central/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/designate/designate-central/config-external.sh \ No newline at end of file diff --git a/docker_templates/designate/designate-central/config-external.sh b/docker_templates/designate/designate-central/config-external.sh new file mode 100644 index 0000000000..ce302ea0c5 --- /dev/null +++ b/docker_templates/designate/designate-central/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/designate/designate.conf" +TARGET="/etc/designate/designate.conf" +OWNER="designate" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/designate/designate-central/start.sh b/docker_templates/designate/designate-central/start.sh deleted file mode 120000 index 5198d98872..0000000000 --- a/docker_templates/designate/designate-central/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/designate/designate-central/start.sh \ No newline at end of file diff --git a/docker_templates/designate/designate-central/start.sh b/docker_templates/designate/designate-central/start.sh new file mode 100755 index 0000000000..eac012d3d2 --- /dev/null +++ b/docker_templates/designate/designate-central/start.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -o errexit +CMD="/usr/bin/designate-central" +ARGS="" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +exec $CMD $ARGS diff --git a/docker_templates/designate/designate-mdns/config-external.sh b/docker_templates/designate/designate-mdns/config-external.sh deleted file mode 120000 index c7be897485..0000000000 --- a/docker_templates/designate/designate-mdns/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/designate/designate-mdns/config-external.sh \ No newline at end of file diff --git a/docker_templates/designate/designate-mdns/config-external.sh b/docker_templates/designate/designate-mdns/config-external.sh new file mode 100644 index 0000000000..ce302ea0c5 --- /dev/null +++ b/docker_templates/designate/designate-mdns/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/designate/designate.conf" +TARGET="/etc/designate/designate.conf" +OWNER="designate" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/designate/designate-mdns/start.sh b/docker_templates/designate/designate-mdns/start.sh deleted file mode 120000 index 26da1f200c..0000000000 --- a/docker_templates/designate/designate-mdns/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/designate/designate-mdns/start.sh \ No newline at end of file diff --git a/docker_templates/designate/designate-mdns/start.sh b/docker_templates/designate/designate-mdns/start.sh new file mode 100755 index 0000000000..b4bcda20cd --- /dev/null +++ b/docker_templates/designate/designate-mdns/start.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -o errexit +CMD="/usr/bin/designate-mdns" +ARGS="" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +exec $CMD $ARGS diff --git a/docker_templates/designate/designate-poolmanager/config-external.sh b/docker_templates/designate/designate-poolmanager/config-external.sh deleted file mode 120000 index 29989479e8..0000000000 --- a/docker_templates/designate/designate-poolmanager/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/designate/designate-poolmanager/config-external.sh \ No newline at end of file diff --git a/docker_templates/designate/designate-poolmanager/config-external.sh b/docker_templates/designate/designate-poolmanager/config-external.sh new file mode 100644 index 0000000000..ce302ea0c5 --- /dev/null +++ b/docker_templates/designate/designate-poolmanager/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/designate/designate.conf" +TARGET="/etc/designate/designate.conf" +OWNER="designate" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/designate/designate-poolmanager/start.sh b/docker_templates/designate/designate-poolmanager/start.sh deleted file mode 120000 index bd7ab705b4..0000000000 --- a/docker_templates/designate/designate-poolmanager/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/designate/designate-poolmanager/start.sh \ No newline at end of file diff --git a/docker_templates/designate/designate-poolmanager/start.sh b/docker_templates/designate/designate-poolmanager/start.sh new file mode 100755 index 0000000000..0752b9847c --- /dev/null +++ b/docker_templates/designate/designate-poolmanager/start.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -o errexit +CMD="/usr/bin/designate-pool-manager" +ARGS="" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +exec $CMD $ARGS diff --git a/docker_templates/designate/designate-sink/config-external.sh b/docker_templates/designate/designate-sink/config-external.sh deleted file mode 120000 index a3a21f3438..0000000000 --- a/docker_templates/designate/designate-sink/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/designate/designate-sink/config-external.sh \ No newline at end of file diff --git a/docker_templates/designate/designate-sink/config-external.sh b/docker_templates/designate/designate-sink/config-external.sh new file mode 100644 index 0000000000..ce302ea0c5 --- /dev/null +++ b/docker_templates/designate/designate-sink/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/designate/designate.conf" +TARGET="/etc/designate/designate.conf" +OWNER="designate" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/designate/designate-sink/start.sh b/docker_templates/designate/designate-sink/start.sh deleted file mode 120000 index 64853dd18a..0000000000 --- a/docker_templates/designate/designate-sink/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/designate/designate-sink/start.sh \ No newline at end of file diff --git a/docker_templates/designate/designate-sink/start.sh b/docker_templates/designate/designate-sink/start.sh new file mode 100755 index 0000000000..d2f93e26fc --- /dev/null +++ b/docker_templates/designate/designate-sink/start.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -o errexit +CMD="/usr/bin/designate-sink" +ARGS="" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +exec $CMD $ARGS