From ba01f942068f2c38d446f9ec52b22bf93ed7aeb2 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Fri, 7 Aug 2015 09:10:15 -0700 Subject: Remove config-internal from designate Change-Id: I15a9c34a08055c6f9ad53f211a8c1a62de3f58ff Partially-Implements: blueprint remove-config-internal --- .../designate/designate-api/config-internal.sh | 41 ---------- docker/common/designate/designate-api/start.sh | 2 +- .../designate-backend-bind9/config-internal.sh | 62 --------------- .../designate/designate-backend-bind9/start.sh | 4 +- .../designate/designate-base/config-designate.sh | 88 ---------------------- .../designate/designate-central/config-internal.sh | 28 ------- docker/common/designate/designate-central/start.sh | 2 +- .../designate/designate-mdns/config-internal.sh | 18 ----- docker/common/designate/designate-mdns/start.sh | 2 +- .../designate-poolmanager/config-internal.sh | 58 -------------- .../designate/designate-poolmanager/start.sh | 2 +- .../designate/designate-sink/config-internal.sh | 65 ---------------- docker/common/designate/designate-sink/start.sh | 2 +- 13 files changed, 7 insertions(+), 367 deletions(-) delete mode 100755 docker/common/designate/designate-api/config-internal.sh delete mode 100755 docker/common/designate/designate-backend-bind9/config-internal.sh delete mode 100755 docker/common/designate/designate-base/config-designate.sh delete mode 100755 docker/common/designate/designate-central/config-internal.sh delete mode 100755 docker/common/designate/designate-mdns/config-internal.sh delete mode 100755 docker/common/designate/designate-poolmanager/config-internal.sh delete mode 100755 docker/common/designate/designate-sink/config-internal.sh (limited to 'docker/common') diff --git a/docker/common/designate/designate-api/config-internal.sh b/docker/common/designate/designate-api/config-internal.sh deleted file mode 100755 index c7eb42c16..000000000 --- a/docker/common/designate/designate-api/config-internal.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -set -e - -. /opt/kolla/kolla-common.sh -. /opt/kolla/config-designate.sh - -CONF=/etc/designate/designate.conf - -check_required_vars ADMIN_TENANT_NAME \ - DESIGNATE_API_SERVICE_HOST \ - DESIGNATE_API_SERVICE_PORT \ - DESIGNATE_KEYSTONE_PASSWORD \ - DESIGNATE_KEYSTONE_USER \ - KEYSTONE_ADMIN_SERVICE_HOST \ - KEYSTONE_ADMIN_SERVICE_PORT \ - KEYSTONE_AUTH_PROTOCOL \ - KEYSTONE_ADMIN_TOKEN - -export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0" - -fail_unless_os_service_running keystone - -crux user-create \ - -n ${DESIGNATE_KEYSTONE_USER} \ - -p ${DESIGNATE_KEYSTONE_PASSWORD} \ - -t ${ADMIN_TENANT_NAME} \ - -r admin - -crux endpoint-create \ - --remove-all \ - -n ${DESIGNATE_KEYSTONE_USER} \ - -t dns \ - -I "${KEYSTONE_AUTH_PROTOCOL}://${DESIGNATE_API_SERVICE_HOST}:${DESIGNATE_API_SERVICE_PORT}/v1" \ - -P "${KEYSTONE_AUTH_PROTOCOL}://${DESIGNATE_API_SERVICE_HOST}:${DESIGNATE_API_SERVICE_PORT}/v1" \ - -A "${KEYSTONE_AUTH_PROTOCOL}://${DESIGNATE_API_SERVICE_HOST}:${DESIGNATE_API_SERVICE_PORT}/v1" - -crudini --set $CONF service:api api_paste_config "/usr/share/designate/api-paste.ini" -crudini --set $CONF service:api api_port "${DESIGNATE_API_SERVICE_PORT}" - -exec /usr/bin/designate-api diff --git a/docker/common/designate/designate-api/start.sh b/docker/common/designate/designate-api/start.sh index 90d17bb53..fe556225b 100755 --- a/docker/common/designate/designate-api/start.sh +++ b/docker/common/designate/designate-api/start.sh @@ -7,7 +7,7 @@ ARGS="" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases diff --git a/docker/common/designate/designate-backend-bind9/config-internal.sh b/docker/common/designate/designate-backend-bind9/config-internal.sh deleted file mode 100755 index 45a127fdd..000000000 --- a/docker/common/designate/designate-backend-bind9/config-internal.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -set -e - -. /opt/kolla/kolla-common.sh - -check_required_vars DESIGNATE_ALLOW_RECURSION \ - DESIGNATE_BIND9_RNDC_KEY \ - DESIGNATE_MASTERNS \ - DESIGNATE_SLAVENS - -NAMEDCFG=/etc/named.conf - -# /var/named is coming from a VOLUME definition but at first boot it needs to -# be populated from the original container since else it would be missing some -# Bind9 core files. These files have been saved during the build phase. - -if [ ! -f /var/named/named.ca ]; then - cp -pr /opt/kolla/var-named/* /var/named/ -fi - -# When rndc adds a new domain, bind adds the call in an nzf file in this -# directory. -chmod 770 /var/named -chown root:named /var/named - -# Default Bind9 behavior is to enable recursion, disable if wanted. -if [ "${DESIGNATE_ALLOW_RECURSION}" == "false" ]; then - sed -i -r "s/(recursion) yes/\1 no/" $NAMEDCFG -fi - -sed -i -r "/listen-on port 53/d" $NAMEDCFG -sed -i -r "/listen-on-v6/d" $NAMEDCFG -sed -i -r "s,/\* Path to ISC DLV key \*/,allow-new-zones yes;," $NAMEDCFG -sed -i -r "/allow-query .+;/d" $NAMEDCFG - -if ! grep -q rndc-key /etc/named.conf; then - cat >> /etc/named.conf < /etc/rndc.key < /etc/rndc.conf <> /etc/rndc.conf -chown named /etc/rndc.key - -# Launch and keep in the foreground. -exec /usr/sbin/named -u named -g diff --git a/docker/common/designate/designate-backend-bind9/start.sh b/docker/common/designate/designate-backend-bind9/start.sh index 180cb4f25..11922974a 100755 --- a/docker/common/designate/designate-backend-bind9/start.sh +++ b/docker/common/designate/designate-backend-bind9/start.sh @@ -4,10 +4,10 @@ set -o errexit CMD="/usr/sbin/named" ARGS="-u named -g" -# Loading common functions. +# Execute config strategy source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS diff --git a/docker/common/designate/designate-base/config-designate.sh b/docker/common/designate/designate-base/config-designate.sh deleted file mode 100755 index 8d433b011..000000000 --- a/docker/common/designate/designate-base/config-designate.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/kolla-common.sh - -get_or_create_domain() { - local DOMAIN_NAME=$1 - - DOMAIN_ID=$(designate domain-create --name $DOMAIN_NAME | awk '/id/ { print $4; }') - # Searching domain if not created - if [ -z $DOMAIN_ID ]; then - DOMAIN_ID=$(designate domain-list | awk "/$DOMAIN_NAME/ { print \$2; }") - fi - # Fail if domain still don't exist - if [ -z $DOMAIN_ID ]; then - echo "Creating domain failed" 1>&2 - exit 1 - fi - - echo $DOMAIN_ID -} - -check_required_vars DEBUG_LOGGING \ - DESIGNATE_BACKEND \ - DESIGNATE_BIND9_RNDC_KEY \ - DESIGNATE_DB_NAME \ - DESIGNATE_DB_PASSWORD \ - DESIGNATE_DB_USER \ - DESIGNATE_KEYSTONE_PASSWORD \ - DESIGNATE_KEYSTONE_USER \ - DESIGNATE_POOLMAN_POOLID \ - KEYSTONE_ADMIN_SERVICE_HOST \ - KEYSTONE_ADMIN_SERVICE_PORT \ - KEYSTONE_AUTH_PROTOCOL \ - KEYSTONE_PUBLIC_SERVICE_HOST \ - KEYSTONE_PUBLIC_SERVICE_PORT \ - RABBITMQ_SERVICE_HOST \ - RABBIT_PASSWORD \ - RABBIT_USERID - -fail_unless_db -dump_vars - -cat > /openrc < /etc/rndc.key <&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/common/designate/designate-sink/start.sh b/docker/common/designate/designate-sink/start.sh index 41637a5f6..d2f93e26f 100755 --- a/docker/common/designate/designate-sink/start.sh +++ b/docker/common/designate/designate-sink/start.sh @@ -7,7 +7,7 @@ ARGS="" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS -- cgit v1.2.3