summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-12-01 20:04:56 +0000
committerGerrit Code Review <review@openstack.org>2017-12-01 20:04:56 +0000
commit2b993f33f9a51ebb609b44e7a6ceb6b4ab09a42f (patch)
tree177dab936ed4cd8606597f80f330229434461eb1
parent4dc7ae3131e455e013a1d59e6c4bfae2be0e8df5 (diff)
parent0f8db9f7542201c1b570f1c7fc51c696911e39ab (diff)
Merge "Enable worker and producer by default in devstack"
-rw-r--r--devstack/settings4
-rw-r--r--playbooks/legacy/designate-devstack-base/run.yaml6
2 files changed, 5 insertions, 5 deletions
diff --git a/devstack/settings b/devstack/settings
index 94fcbbf..1ed3f3f 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -77,8 +77,8 @@ TEMPEST_SERVICES+=,designate
77enable_service designate 77enable_service designate
78enable_service designate-central 78enable_service designate-central
79enable_service designate-api 79enable_service designate-api
80enable_service designate-pool-manager 80enable_service designate-worker
81enable_service designate-zone-manager 81enable_service designate-producer
82enable_service designate-mdns 82enable_service designate-mdns
83enable_service designate-agent 83enable_service designate-agent
84enable_service designate-sink 84enable_service designate-sink
diff --git a/playbooks/legacy/designate-devstack-base/run.yaml b/playbooks/legacy/designate-devstack-base/run.yaml
index 847ccce..cbaff5f 100644
--- a/playbooks/legacy/designate-devstack-base/run.yaml
+++ b/playbooks/legacy/designate-devstack-base/run.yaml
@@ -61,9 +61,9 @@
61 export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False" 61 export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
62 fi 62 fi
63 63
64 if [ "{{ worker_model }}" == "1" ] ; then 64 if [ "{{ worker_model }}" == "0" ] ; then
65 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service designate-worker designate-producer" 65 export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service designate-worker designate-producer"
66 export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service designate-pool-manager designate-zone-manager" 66 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service designate-pool-manager designate-zone-manager"
67 fi 67 fi
68 68
69 export OVERRIDE_ENABLED_SERVICES=$services 69 export OVERRIDE_ENABLED_SERVICES=$services