aboutsummaryrefslogtreecommitdiff
path: root/docker/common/designate
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-30 18:54:43 +0000
committerGerrit Code Review <review@openstack.org>2015-07-30 18:54:43 +0000
commit731d5205cbed74028bda0883a5432afc476605b6 (patch)
tree38a04d3f8f1d817fc08931d23df29fff416c82ab /docker/common/designate
parent15eb390ab307885943280a4b5d1287dc580517aa (diff)
parent1c147e4def0605e64a41916b71a9f2e675a0cbcf (diff)
downloadkolla-731d5205cbed74028bda0883a5432afc476605b6.tar.gz
kolla-731d5205cbed74028bda0883a5432afc476605b6.zip
Merge "Update service helper scripts for variable changes"
Diffstat (limited to 'docker/common/designate')
-rwxr-xr-xdocker/common/designate/designate-api/config-internal.sh14
-rwxr-xr-xdocker/common/designate/designate-backend-bind9/config-internal.sh6
-rwxr-xr-xdocker/common/designate/designate-base/config-designate.sh25
-rwxr-xr-xdocker/common/designate/designate-central/config-internal.sh8
-rwxr-xr-xdocker/common/designate/designate-mdns/config-internal.sh3
-rwxr-xr-xdocker/common/designate/designate-poolmanager/config-internal.sh12
-rwxr-xr-xdocker/common/designate/designate-sink/config-internal.sh3
7 files changed, 48 insertions, 23 deletions
diff --git a/docker/common/designate/designate-api/config-internal.sh b/docker/common/designate/designate-api/config-internal.sh
index aae50ea8f..c7eb42c16 100755
--- a/docker/common/designate/designate-api/config-internal.sh
+++ b/docker/common/designate/designate-api/config-internal.sh
@@ -6,11 +6,15 @@ set -e
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
+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"
diff --git a/docker/common/designate/designate-backend-bind9/config-internal.sh b/docker/common/designate/designate-backend-bind9/config-internal.sh
index 90d2de676..45a127fdd 100755
--- a/docker/common/designate/designate-backend-bind9/config-internal.sh
+++ b/docker/common/designate/designate-backend-bind9/config-internal.sh
@@ -3,8 +3,10 @@ set -e
. /opt/kolla/kolla-common.sh
-check_required_vars DESIGNATE_MASTERNS DESIGNATE_SLAVENS DESIGNATE_BIND9_RNDC_KEY \
- DESIGNATE_ALLOW_RECURSION
+check_required_vars DESIGNATE_ALLOW_RECURSION \
+ DESIGNATE_BIND9_RNDC_KEY \
+ DESIGNATE_MASTERNS \
+ DESIGNATE_SLAVENS
NAMEDCFG=/etc/named.conf
diff --git a/docker/common/designate/designate-base/config-designate.sh b/docker/common/designate/designate-base/config-designate.sh
index 6edfd1bd2..8d433b011 100755
--- a/docker/common/designate/designate-base/config-designate.sh
+++ b/docker/common/designate/designate-base/config-designate.sh
@@ -21,14 +21,23 @@ get_or_create_domain() {
echo $DOMAIN_ID
}
-check_required_vars DESIGNATE_DB_PASSWORD DESIGNATE_KEYSTONE_PASSWORD \
- KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST \
- DESIGNATE_BIND9_RNDC_KEY DESIGNATE_BACKEND \
- KEYSTONE_PUBLIC_SERVICE_PORT DESIGNATE_KEYSTONE_USER \
- RABBIT_USERID RABBIT_PASSWORD DESIGNATE_DB_USER \
- DESIGNATE_DB_NAME KEYSTONE_AUTH_PROTOCOL \
- KEYSTONE_ADMIN_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_PORT \
- DEBUG_LOGGING DESIGNATE_POOLMAN_POOLID
+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
diff --git a/docker/common/designate/designate-central/config-internal.sh b/docker/common/designate/designate-central/config-internal.sh
index 44cf89130..1f91b06e1 100755
--- a/docker/common/designate/designate-central/config-internal.sh
+++ b/docker/common/designate/designate-central/config-internal.sh
@@ -4,8 +4,12 @@ set -e
. /opt/kolla/kolla-common.sh
. /opt/kolla/config-designate.sh
-check_required_vars MARIADB_SERVICE_HOST DB_ROOT_PASSWORD DESIGNATE_DB_NAME \
- DESIGNATE_DB_USER DESIGNATE_DB_PASSWORD INIT_DESIGNATE_DB
+check_required_vars DB_ROOT_PASSWORD \
+ DESIGNATE_DB_NAME \
+ DESIGNATE_DB_PASSWORD \
+ DESIGNATE_DB_USER \
+ INIT_DESIGNATE_DB \
+ MARIADB_SERVICE_HOST
fail_unless_db
diff --git a/docker/common/designate/designate-mdns/config-internal.sh b/docker/common/designate/designate-mdns/config-internal.sh
index a3e5df274..cd3383b0d 100755
--- a/docker/common/designate/designate-mdns/config-internal.sh
+++ b/docker/common/designate/designate-mdns/config-internal.sh
@@ -4,7 +4,8 @@ set -e
. /opt/kolla/kolla-common.sh
. /opt/kolla/config-designate.sh
-check_required_vars DESIGNATE_MASTERNS DESIGNATE_MDNS_PORT
+check_required_vars DESIGNATE_MASTERNS \
+ DESIGNATE_MDNS_PORT
CONF=/etc/designate/designate.conf
diff --git a/docker/common/designate/designate-poolmanager/config-internal.sh b/docker/common/designate/designate-poolmanager/config-internal.sh
index f5222b3f4..c20a09676 100755
--- a/docker/common/designate/designate-poolmanager/config-internal.sh
+++ b/docker/common/designate/designate-poolmanager/config-internal.sh
@@ -4,10 +4,14 @@ set -e
. /opt/kolla/kolla-common.sh
. /opt/kolla/config-designate.sh
-check_required_vars DESIGNATE_MASTERNS DESIGNATE_BACKEND DESIGNATE_SLAVENS \
- DESIGNATE_MDNS_PORT DESIGNATE_DNS_PORT DESIGNATE_POOLMAN_POOLID \
- DESIGNATE_POOLMAN_TARGETS DESIGNATE_POOLMAN_NSS \
- DESIGNATE_POOLMAN_POOLID
+check_required_vars DESIGNATE_BACKEND \
+ DESIGNATE_DNS_PORT \
+ DESIGNATE_MASTERNS \
+ DESIGNATE_MDNS_PORT \
+ DESIGNATE_POOLMAN_NSS \
+ DESIGNATE_POOLMAN_POOLID \
+ DESIGNATE_POOLMAN_TARGETS \
+ DESIGNATE_SLAVENS
CONF=/etc/designate/designate.conf
diff --git a/docker/common/designate/designate-sink/config-internal.sh b/docker/common/designate/designate-sink/config-internal.sh
index a6a3a4bac..e32111fb3 100755
--- a/docker/common/designate/designate-sink/config-internal.sh
+++ b/docker/common/designate/designate-sink/config-internal.sh
@@ -30,7 +30,8 @@ configure_neutron_handler() {
done
}
-check_required_vars DESIGNATE_API_SERVICE_HOST DESIGNATE_API_SERVICE_PORT \
+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 $?