From 64f23c1d133fea984a88f4487fe44d088b3419b1 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <michal.rostecki@allegrogroup.com>
Date: Mon, 22 Jun 2015 17:56:04 +0200
Subject: [PATCH] Move Designate-Sink start.sh to docker/common
All start.sh scripts should be in docker/common directory
instead of docker/centos.
Change-Id: Ifc1d07246e3b56156a1dc861e2b262f75c1cd918
Closes-Bug: #1467528
---
.../binary/designate/designate-sink/start.sh | 65 +------------------
.../common/designate/designate-sink/start.sh | 64 ++++++++++++++++++
2 files changed, 65 insertions(+), 64 deletions(-)
mode change 100755 => 120000 docker/centos/binary/designate/designate-sink/start.sh
create mode 100755 docker/common/designate/designate-sink/start.sh
diff --git a/docker/centos/binary/designate/designate-sink/start.sh b/docker/centos/binary/designate/designate-sink/start.sh
deleted file mode 100755
index a6a3a4bacb..0000000000
--- a/docker/centos/binary/designate/designate-sink/start.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-set -e
-
-. /opt/kolla/kolla-common.sh
-. /opt/kolla/config-designate.sh
-
-CONF=/etc/designate/designate.conf
-
-configure_nova_handler() {
- local DOMAIN_ID=$1
-
- crudini --set $CONF handler:nova_fixed domain_id "$DOMAIN_ID"
- crudini --set $CONF handler:nova_fixed notification_topics "notifications"
- crudini --set $CONF handler:nova_fixed control_exchange "nova"
- # Configuring multiple record formats
- for FORMAT in $DESIGNATE_SINK_NOVA_FORMATS; do
- crudini --set $CONF handler:nova_fixed format "$FORMAT"
- done
-}
-
-configure_neutron_handler() {
- local DOMAIN_ID=$1
-
- crudini --set $CONF handler:neutron_floatingip domain_id "$DOMAIN_ID"
- crudini --set $CONF handler:neutron_floatingip notification_topics "notifications"
- crudini --set $CONF handler:neutron_floatingip control_exchange "neutron"
- # Configuring multiple record formats
- for FORMAT in $DESIGNATE_SINK_NEUTRON_FORMATS; do
- crudini --set $CONF handler:neutron_floatingip format "$FORMAT"
- done
-}
-
-check_required_vars DESIGNATE_API_SERVICE_HOST DESIGNATE_API_SERVICE_PORT \
- DESIGNATE_DEFAULT_POOL_NS_RECORD
-
-check_for_os_service_endpoint designate DESIGNATE_API_SERVICE_HOST DESIGNATE_API_SERVICE_PORT || exit $?
-
-if [ -z "$DESIGNATE_SINK_NOVA_DOMAIN_NAME" && -z "$DESIGNATE_SINK_NEUTRON_DOMAIN_NAME" ]; then
- echo "Please specify either Nova or Neutron domain name for Designate Sink"
- exit 1
-fi
-
-designate server-create --name ${DESIGNATE_DEFAULT_POOL_NS_RECORD}
-if [ $? != 0 ]; then
- echo "Creating server failed" 1>&2
- exit 1
-fi
-
-if [ -n "$DESIGNATE_SINK_NOVA_DOMAIN_NAME" ]; then
- NOVA_DOMAIN_ID=$(get_or_create_domain $DESIGNATE_SINK_NOVA_DOMAIN_NAME)
- configure_nova_handler $NOVA_DOMAIN_ID
- HANDLERS="nova_fixed"
-fi
-
-if [ -n "$DESIGNATE_SINK_NEUTRON_DOMAIN_NAME" ]; then
- NEUTRON_DOMAIN_ID=$(get_or_create_domain $DESIGNATE_SINK_NEUTRON_DOMAIN_NAME)
- configure_neutron_handler $NEUTRON_DOMAIN_ID
- [ -n "$HANDLERS" ] && HANDLERS+=","
- HANDLERS+="neutron_floatingip"
-fi
-
-crudini --set $CONF service:sink enabled_notification_handlers "$HANDLERS"
-
-exec /usr/bin/designate-sink
diff --git a/docker/centos/binary/designate/designate-sink/start.sh b/docker/centos/binary/designate/designate-sink/start.sh
new file mode 120000
index 0000000000..751b58345d
--- /dev/null
+++ b/docker/centos/binary/designate/designate-sink/start.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-sink/start.sh
\ No newline at end of file
diff --git a/docker/common/designate/designate-sink/start.sh b/docker/common/designate/designate-sink/start.sh
new file mode 100755
index 0000000000..a6a3a4bacb
--- /dev/null
+++ b/docker/common/designate/designate-sink/start.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+set -e
+
+. /opt/kolla/kolla-common.sh
+. /opt/kolla/config-designate.sh
+
+CONF=/etc/designate/designate.conf
+
+configure_nova_handler() {
+ local DOMAIN_ID=$1
+
+ crudini --set $CONF handler:nova_fixed domain_id "$DOMAIN_ID"
+ crudini --set $CONF handler:nova_fixed notification_topics "notifications"
+ crudini --set $CONF handler:nova_fixed control_exchange "nova"
+ # Configuring multiple record formats
+ for FORMAT in $DESIGNATE_SINK_NOVA_FORMATS; do
+ crudini --set $CONF handler:nova_fixed format "$FORMAT"
+ done
+}
+
+configure_neutron_handler() {
+ local DOMAIN_ID=$1
+
+ crudini --set $CONF handler:neutron_floatingip domain_id "$DOMAIN_ID"
+ crudini --set $CONF handler:neutron_floatingip notification_topics "notifications"
+ crudini --set $CONF handler:neutron_floatingip control_exchange "neutron"
+ # Configuring multiple record formats
+ for FORMAT in $DESIGNATE_SINK_NEUTRON_FORMATS; do
+ crudini --set $CONF handler:neutron_floatingip format "$FORMAT"
+ done
+}
+
+check_required_vars DESIGNATE_API_SERVICE_HOST DESIGNATE_API_SERVICE_PORT \
+ DESIGNATE_DEFAULT_POOL_NS_RECORD
+
+check_for_os_service_endpoint designate DESIGNATE_API_SERVICE_HOST DESIGNATE_API_SERVICE_PORT || exit $?
+
+if [ -z "$DESIGNATE_SINK_NOVA_DOMAIN_NAME" && -z "$DESIGNATE_SINK_NEUTRON_DOMAIN_NAME" ]; then
+ echo "Please specify either Nova or Neutron domain name for Designate Sink"
+ exit 1
+fi
+
+designate server-create --name ${DESIGNATE_DEFAULT_POOL_NS_RECORD}
+if [ $? != 0 ]; then
+ echo "Creating server failed" 1>&2
+ exit 1
+fi
+
+if [ -n "$DESIGNATE_SINK_NOVA_DOMAIN_NAME" ]; then
+ NOVA_DOMAIN_ID=$(get_or_create_domain $DESIGNATE_SINK_NOVA_DOMAIN_NAME)
+ configure_nova_handler $NOVA_DOMAIN_ID
+ HANDLERS="nova_fixed"
+fi
+
+if [ -n "$DESIGNATE_SINK_NEUTRON_DOMAIN_NAME" ]; then
+ NEUTRON_DOMAIN_ID=$(get_or_create_domain $DESIGNATE_SINK_NEUTRON_DOMAIN_NAME)
+ configure_neutron_handler $NEUTRON_DOMAIN_ID
+ [ -n "$HANDLERS" ] && HANDLERS+=","
+ HANDLERS+="neutron_floatingip"
+fi
+
+crudini --set $CONF service:sink enabled_notification_handlers "$HANDLERS"
+
+exec /usr/bin/designate-sink
--
GitLab