Merge "Add config-internal/config-external to Designate containers"

docker/centos/binary/designate/designate-api/Dockerfile

@@ -6,5 +6,6 @@ RUN yum install -y \
     && yum clean all
 
 COPY start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]

docker/centos/binary/designate/designate-api/config-external.sh

+../../../../common/designate/designate-api/config-external.sh
\ No newline at end of file

docker/centos/binary/designate/designate-api/config-internal.sh

+../../../../common/designate/designate-api/config-internal.sh
\ No newline at end of file

docker/centos/binary/designate/designate-backend-bind9/Dockerfile

@@ -6,5 +6,6 @@ RUN yum install -y bind \
     && cp -pr /var/named /opt/kolla/var-named
 
 COPY start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]

docker/centos/binary/designate/designate-backend-bind9/config-external.sh

+../../../../common/designate/designate-backend-bind9/config-external.sh
\ No newline at end of file

docker/centos/binary/designate/designate-backend-bind9/config-internal.sh

+../../../../common/designate/designate-backend-bind9/config-internal.sh
\ No newline at end of file

docker/centos/binary/designate/designate-central/Dockerfile

@@ -6,5 +6,6 @@ RUN yum install -y \
     && yum clean all
 
 COPY start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]

docker/centos/binary/designate/designate-central/config-external.sh

+../../../../common/designate/designate-central/config-external.sh
\ No newline at end of file

docker/centos/binary/designate/designate-central/config-internal.sh

+../../../../common/designate/designate-central/config-internal.sh
\ No newline at end of file

docker/centos/binary/designate/designate-mdns/Dockerfile

@@ -5,5 +5,6 @@ RUN yum install -y openstack-designate-mdns \
     && yum clean all
 
 COPY start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]

docker/centos/binary/designate/designate-mdns/config-external.sh

+../../../../common/designate/designate-mdns/config-external.sh
\ No newline at end of file

docker/centos/binary/designate/designate-mdns/config-internal.sh

+../../../../common/designate/designate-mdns/config-internal.sh
\ No newline at end of file

docker/centos/binary/designate/designate-poolmanager/Dockerfile

@@ -8,5 +8,6 @@ RUN yum install -y \
     && yum clean all
 
 COPY start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]

docker/centos/binary/designate/designate-poolmanager/config-external.sh

+../../../../common/designate/designate-poolmanager/config-external.sh
\ No newline at end of file

docker/centos/binary/designate/designate-poolmanager/config-internal.sh

+../../../../common/designate/designate-poolmanager/config-internal.sh
\ No newline at end of file

docker/centos/binary/designate/designate-sink/Dockerfile

@@ -7,5 +7,6 @@ RUN yum install -y \
     && yum clean all
 
 COPY start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]

docker/centos/binary/designate/designate-sink/config-external.sh

+../../../../common/designate/designate-sink/config-external.sh
\ No newline at end of file

docker/centos/binary/designate/designate-sink/config-internal.sh

+../../../../common/designate/designate-sink/config-internal.sh
\ No newline at end of file

docker/common/designate/designate-api/config-external.sh

+#!/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

docker/common/designate/designate-api/config-internal.sh

+#!/bin/bash
+set -e
+
+. /opt/kolla/kolla-common.sh
+. /opt/kolla/config-designate.sh
+
+CONF=/etc/designate/designate.conf
+
+check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
+                    DESIGNATE_KEYSTONE_USER DESIGNATE_KEYSTONE_PASSWORD \
+                    KEYSTONE_AUTH_PROTOCOL ADMIN_TENANT_NAME \
+                    DESIGNATE_API_SERVICE_HOST DESIGNATE_API_SERVICE_PORT \
+                    KEYSTONE_ADMIN_SERVICE_PORT
+
+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