From 0f8db9f7542201c1b570f1c7fc51c696911e39ab Mon Sep 17 00:00:00 2001 From: Ritesh Anand Date: Mon, 27 Nov 2017 13:55:16 -0800 Subject: [PATCH] Enable worker and producer by default in devstack In devstack settings we have pool-manager and zone-manager enabled by default. This causes conflict if a user wants to run designate plugin with worker and producer. This change replaces pool-manager and zone-manager with worker and producer in devstack settings. Closes-Bug: #1733992 Change-Id: Id96f1430d1091f2485099523fae499bde377e7e6 --- devstack/settings | 4 ++-- playbooks/legacy/designate-devstack-base/run.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devstack/settings b/devstack/settings index 94fcbbf57..1ed3f3f6a 100644 --- a/devstack/settings +++ b/devstack/settings @@ -77,8 +77,8 @@ TEMPEST_SERVICES+=,designate enable_service designate enable_service designate-central enable_service designate-api -enable_service designate-pool-manager -enable_service designate-zone-manager +enable_service designate-worker +enable_service designate-producer enable_service designate-mdns enable_service designate-agent enable_service designate-sink diff --git a/playbooks/legacy/designate-devstack-base/run.yaml b/playbooks/legacy/designate-devstack-base/run.yaml index 847cccebc..cbaff5f20 100644 --- a/playbooks/legacy/designate-devstack-base/run.yaml +++ b/playbooks/legacy/designate-devstack-base/run.yaml @@ -61,9 +61,9 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False" fi - if [ "{{ worker_model }}" == "1" ] ; then - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service designate-worker designate-producer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service designate-pool-manager designate-zone-manager" + if [ "{{ worker_model }}" == "0" ] ; then + export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service designate-worker designate-producer" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service designate-pool-manager designate-zone-manager" fi export OVERRIDE_ENABLED_SERVICES=$services