openstack
/
designate
Code Issues Proposed changes

Merge "Switch devstack to use local.conf"

This commit is contained in:
Jenkins 2015-12-04 13:33:21 +00:00 committed by Gerrit Code Review
parent de9ab11130 7879bff48d
commit 4e7d773d9d
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/vagrant/Vagrantfile vendored
View File

@ -71,11 +71,11 @@ if [ ! -d "/home/vagrant/devstack" ]; then
git clone https://git.openstack.org/openstack-dev/devstack.git /home/vagrant/devstack git clone https://git.openstack.org/openstack-dev/devstack.git /home/vagrant/devstack
fi fi
# Install Vagrant localrc sample # Install Vagrant local.conf sample
cd /opt/stack/designate/contrib/vagrant cd /opt/stack/designate/contrib/vagrant
if [ ! -f "/home/vagrant/devstack/localrc" ]; then if [ ! -f "/home/vagrant/devstack/local.conf" ]; then
cp localrc /home/vagrant/devstack/localrc cp local.conf /home/vagrant/devstack/local.conf
fi fi
# Link in any Rally Plugins # Link in any Rally Plugins

27
contrib/vagrant/localrc → contrib/vagrant/local.conf
View File

@ -1,3 +1,4 @@
[[local|localrc]]
# General DevStack Config # General DevStack Config
# ======================= # =======================
ADMIN_PASSWORD=password ADMIN_PASSWORD=password
@ -15,8 +16,9 @@ SCREEN_LOGDIR=/opt/stack/logs
VERBOSE=True VERBOSE=True
LOG_COLOR=True LOG_COLOR=True
# Enable the basic services we require # Disable all services except core ones
ENABLED_SERVICES=rabbit,mysql,key disable_all_services
enable_service rabbit mysql key
# Enable designate # Enable designate
enable_plugin designate https://git.openstack.org/openstack/designate enable_plugin designate https://git.openstack.org/openstack/designate
@ -24,11 +26,11 @@ enable_plugin designate https://git.openstack.org/openstack/designate
# Designate Devstack Config # Designate Devstack Config
# ========================= # =========================
# Enable core Designate services # Enable core Designate services
ENABLED_SERVICES+=,designate,designate-central,designate-api,designate-pool-manager,designate-zone-manager,designate-mdns enable_service designate,designate-central,designate-api,designate-pool-manager,designate-zone-manager,designate-mdns
# Optional Designate services # Optional Designate services
#ENABLED_SERVICES+=,designate-agent #enable_service designate-agent
#ENABLED_SERVICES+=,designate-sink #enable_service designate-sink
# Backend Driver (e.g. powerdns, bind9. See designate.backend section of # Backend Driver (e.g. powerdns, bind9. See designate.backend section of
# setup.cfg) # setup.cfg)
@ -102,22 +104,23 @@ ENABLED_SERVICES+=,designate,designate-central,designate-api,designate-pool-mana
# Other Devstack Config # Other Devstack Config
# ===================== # =====================
# Optional TLS Proxy # Optional TLS Proxy
#ENABLED_SERVICES+=,tls-proxy #enable_service tls-proxy
# Optional Tempest # Optional Tempest
#ENABLED_SERVICES+=,tempest #enable_service tempest
# Optional Rally # Optional Rally
#ENABLED_SERVICES+=,rally #enable_service rally
# Optional Horizon # Optional Horizon
#ENABLED_SERVICES+=,horizon #enable_service horizon
# Optional Glance # Optional Glance
#ENABLED_SERVICES+=,g-api,g-reg #enable_service g-api,g-reg
# Optional Nova # Optional Nova
#ENABLED_SERVICES+=,n-api,n-cpu,n-net,n-cond,n-sch,n-novnc #enable_service n-api n-cpu n-net n-cond n-sch n-novnc
# Optional Neutron # Optional Neutron
#ENABLED_SERVICES+=,-n-net,q-svc,q-agt,q-dhcp,q-l3,q-meta #disable_service n-net
#enable_service q-svc q-agt q-dhcp q-l3 q-meta