diff --git a/contrib/devstack/lib/designate b/contrib/devstack/lib/designate
index e74f70d9d..1eb8ebb6c 100644
--- a/contrib/devstack/lib/designate
+++ b/contrib/devstack/lib/designate
@@ -2,7 +2,7 @@
 # Install and start **Designate** service
 
 # To enable Designate services, add the following to localrc
-# enable_service designate,designate-api,designate-central,designate-mdns,designate-sink,designate-pool-manager
+# enable_service designate,designate-central,designate-api,designate-pool-manager,designate-mdns,designate-agent,designate-sink
 
 # stack.sh
 # ---------
@@ -221,21 +221,12 @@ function install_designateclient {
 function start_designate {
     start_designate_backend
 
-    # If using bind9, central must have access to the bind zone/db files.
-    # The configure phase has already added the $STACK_USER to the bind
-    # system daemon group - we need to start central using that group using sg.
-    # nova does a similar "trick" with libvirtd and compute.
-    # sg will be used in run_process to execute designate-central as a member
-    # of the **$BIND_GROUP** group.
-    if [[ "$DESIGNATE_BACKEND_DRIVER" = 'bind9' ]]; then
-        run_process designate-central "designate-central --config-file $DESIGNATE_CONF" $BIND_GROUP
-    else
-        run_process designate-central "$DESIGNATE_BIN_DIR/designate-central --config-file $DESIGNATE_CONF"
-    fi
+    run_process designate-central "$DESIGNATE_BIN_DIR/designate-central --config-file $DESIGNATE_CONF"
     run_process designate-api "$DESIGNATE_BIN_DIR/designate-api --config-file $DESIGNATE_CONF"
-    run_process designate-mdns "$DESIGNATE_BIN_DIR/designate-mdns --config-file $DESIGNATE_CONF"
-    run_process designate-sink "$DESIGNATE_BIN_DIR/designate-sink --config-file $DESIGNATE_CONF"
     run_process designate-pool-manager "$DESIGNATE_BIN_DIR/designate-pool-manager --config-file $DESIGNATE_CONF"
+    run_process designate-mdns "$DESIGNATE_BIN_DIR/designate-mdns --config-file $DESIGNATE_CONF"
+    run_process designate-agent "$DESIGNATE_BIN_DIR/designate-agent --config-file $DESIGNATE_CONF"
+    run_process designate-sink "$DESIGNATE_BIN_DIR/designate-sink --config-file $DESIGNATE_CONF"
 
     # Start proxies if enabled
     if is_service_enabled designate-api && is_service_enabled tls-proxy; then
@@ -250,11 +241,12 @@ function start_designate {
 # stop_designate - Stop running processes
 function stop_designate {
     # Kill the designate screen windows
-    stop_process designate-api
     stop_process designate-central
-    stop_process designate-mdns
-    stop_process designate-sink
+    stop_process designate-api
     stop_process designate-pool-manager
+    stop_process designate-mdns
+    stop_process designate-agent
+    stop_process designate-sink
 
     stop_designate_backend
 }
diff --git a/contrib/vagrant/localrc b/contrib/vagrant/localrc
index 6f8b50c6d..703959e80 100644
--- a/contrib/vagrant/localrc
+++ b/contrib/vagrant/localrc
@@ -1,4 +1,5 @@
-# Passwords
+# General DevStack Config
+# =======================
 ADMIN_PASSWORD=password
 MYSQL_PASSWORD=password
 RABBIT_PASSWORD=password
@@ -17,12 +18,22 @@ LOG_COLOR=True
 # Enable the basic services we require
 ENABLED_SERVICES=rabbit,mysql,key
 
+# Designate Devstack Config
+# =========================
 # Enable core Designate services
-ENABLED_SERVICES+=,designate,designate-api,designate-central,designate-mdns,designate-pool-manager
+ENABLED_SERVICES+=,designate,designate-central,designate-api,designate-pool-manager,designate-mdns
 
 # Optional Designate services
+#ENABLED_SERVICES+=,designate-agent
 #ENABLED_SERVICES+=,designate-sink
 
+# Backend Driver (e.g. powerdns, bind9. See designate.backend section of
+#                 setup.cfg)
+#DESIGNATE_BACKEND_DRIVER=powerdns
+
+
+# Other Devstack Config
+# =====================
 # Optional TLS Proxy
 #ENABLED_SERVICES+=,tls-proxy
 
@@ -34,6 +45,3 @@ ENABLED_SERVICES+=,designate,designate-api,designate-central,designate-mdns,desi
 
 # Optional core OpenStack services (needed by horizon)
 #ENABLED_SERVICES+=,g-api,g-reg,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,n-sch,n-novnc,n-xvnc,n-cauth
-
-# Designate Options
-#DESIGNATE_BACKEND_DRIVER=powerdns