openstack/designate
Code Issues Proposed changes

Add designate-agent to DevStack

Browse Source 
This adds the service, but doesn't configure it etc
yet, additionally, do some cleanup and reordering
for consistency.

Change-Id: I205a6feb7650789099a20bfc64b15e2fd7714e90
This commit is contained in:
Kiall Mac Innes 2015-03-05 12:11:31 +00:00
parent ea00317a3d
commit dacbc70c60
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
contrib/devstack/lib/designate
View File

@ -2,7 +2,7 @@
# Install and start **Designate** service # Install and start **Designate** service
# To enable Designate services, add the following to localrc # 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 # stack.sh
# --------- # ---------
@ -221,21 +221,12 @@ function install_designateclient {
function start_designate { function start_designate {
start_designate_backend start_designate_backend
# If using bind9, central must have access to the bind zone/db files. run_process designate-central "$DESIGNATE_BIN_DIR/designate-central --config-file $DESIGNATE_CONF"
# 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-api "$DESIGNATE_BIN_DIR/designate-api --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-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 # Start proxies if enabled
if is_service_enabled designate-api && is_service_enabled tls-proxy; then if is_service_enabled designate-api && is_service_enabled tls-proxy; then
@ -250,11 +241,12 @@ function start_designate {
# stop_designate - Stop running processes # stop_designate - Stop running processes
function stop_designate { function stop_designate {
# Kill the designate screen windows # Kill the designate screen windows
stop_process designate-api
stop_process designate-central stop_process designate-central
stop_process designate-mdns stop_process designate-api
stop_process designate-sink
stop_process designate-pool-manager stop_process designate-pool-manager
stop_process designate-mdns
stop_process designate-agent
stop_process designate-sink
stop_designate_backend stop_designate_backend
} }

18
contrib/vagrant/localrc
View File

@ -1,4 +1,5 @@
# Passwords # General DevStack Config
# =======================
ADMIN_PASSWORD=password ADMIN_PASSWORD=password
MYSQL_PASSWORD=password MYSQL_PASSWORD=password
RABBIT_PASSWORD=password RABBIT_PASSWORD=password
@ -17,12 +18,22 @@ LOG_COLOR=True
# Enable the basic services we require # Enable the basic services we require
ENABLED_SERVICES=rabbit,mysql,key ENABLED_SERVICES=rabbit,mysql,key
# Designate Devstack Config
# =========================
# Enable core Designate services # 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 # Optional Designate services
#ENABLED_SERVICES+=,designate-agent
#ENABLED_SERVICES+=,designate-sink #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 # Optional TLS Proxy
#ENABLED_SERVICES+=,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) # 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 #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