From 20c8dbff73ed65641c4c77140b5bdbed0a53dbf6 Mon Sep 17 00:00:00 2001 From: Kiall Mac Innes Date: Tue, 30 Jun 2015 12:59:29 +0100 Subject: [PATCH] Add DevStack support for coordination URL Change-Id: I91b8f5c526be79a41fd862df9d4bf394375bc006 --- contrib/devstack/lib/designate | 6 ++++++ contrib/vagrant/localrc | 3 +++ 2 files changed, 9 insertions(+) diff --git a/contrib/devstack/lib/designate b/contrib/devstack/lib/designate index c5b599c5f..f5e2f0ccc 100644 --- a/contrib/devstack/lib/designate +++ b/contrib/devstack/lib/designate @@ -50,6 +50,7 @@ DESIGNATE_NOTIFICATION_DRIVER=${DESIGNATE_NOTIFICATION_DRIVER:-} DESIGNATE_NOTIFICATION_TOPICS=${DESIGNATE_NOTIFICATION_TOPICS:-notifications} DESIGNATE_PERIODIC_RECOVERY_INTERVAL=${DESIGNATE_PERIODIC_RECOVERY_INTERVAL:-120} DESIGNATE_PERIODIC_SYNC_INTERVAL=${DESIGNATE_PERIODIC_SYNC_INTERVAL:-1800} +DESIGNATE_COORDINATION_URL=${DESIGNATE_COORDINATION_URL:-} # Public IP/Port Settings DESIGNATE_SERVICE_PROTOCOL=${DESIGNATE_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} @@ -118,6 +119,11 @@ function configure_designate { iniset $DESIGNATE_CONF DEFAULT root-helper sudo designate-rootwrap $DESIGNATE_ROOTWRAP_CONF iniset $DESIGNATE_CONF storage:sqlalchemy connection `database_connection_url designate` + # Coordination Configuration + if [[ -n "$DESIGNATE_COORDINATION_URL" ]]; then + iniset $DESIGNATE_CONF coordination backend_url $DESIGNATE_COORDINATION_URL + fi + # Install the policy file for the API server cp $DESIGNATE_DIR/etc/designate/policy.json $DESIGNATE_CONF_DIR/policy.json iniset $DESIGNATE_CONF DEFAULT policy_file $DESIGNATE_CONF_DIR/policy.json diff --git a/contrib/vagrant/localrc b/contrib/vagrant/localrc index 6ce2e4bc8..28808e3b8 100644 --- a/contrib/vagrant/localrc +++ b/contrib/vagrant/localrc @@ -65,6 +65,9 @@ ENABLED_SERVICES+=,designate,designate-central,designate-api,designate-pool-mana # Set Notification topics #DESIGNATE_NOTIFICATION_TOPICS=notifications +# Set coordination service URL (e.g. kazoo://localhost/) +#DESIGNATE_COORDINATION_URL= + # Other Devstack Config # =====================