Merge "Switch devstack to use local.conf"
This commit is contained in:
commit
4e7d773d9d
6
contrib/vagrant/Vagrantfile
vendored
6
contrib/vagrant/Vagrantfile
vendored
@ -71,11 +71,11 @@ if [ ! -d "/home/vagrant/devstack" ]; then
|
||||
git clone https://git.openstack.org/openstack-dev/devstack.git /home/vagrant/devstack
|
||||
fi
|
||||
|
||||
# Install Vagrant localrc sample
|
||||
# Install Vagrant local.conf sample
|
||||
cd /opt/stack/designate/contrib/vagrant
|
||||
|
||||
if [ ! -f "/home/vagrant/devstack/localrc" ]; then
|
||||
cp localrc /home/vagrant/devstack/localrc
|
||||
if [ ! -f "/home/vagrant/devstack/local.conf" ]; then
|
||||
cp local.conf /home/vagrant/devstack/local.conf
|
||||
fi
|
||||
|
||||
# Link in any Rally Plugins
|
||||
|
@ -1,3 +1,4 @@
|
||||
[[local|localrc]]
|
||||
# General DevStack Config
|
||||
# =======================
|
||||
ADMIN_PASSWORD=password
|
||||
@ -15,8 +16,9 @@ SCREEN_LOGDIR=/opt/stack/logs
|
||||
VERBOSE=True
|
||||
LOG_COLOR=True
|
||||
|
||||
# Enable the basic services we require
|
||||
ENABLED_SERVICES=rabbit,mysql,key
|
||||
# Disable all services except core ones
|
||||
disable_all_services
|
||||
enable_service rabbit mysql key
|
||||
|
||||
# Enable 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
|
||||
# =========================
|
||||
# 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
|
||||
#ENABLED_SERVICES+=,designate-agent
|
||||
#ENABLED_SERVICES+=,designate-sink
|
||||
#enable_service designate-agent
|
||||
#enable_service designate-sink
|
||||
|
||||
# Backend Driver (e.g. powerdns, bind9. See designate.backend section of
|
||||
# setup.cfg)
|
||||
@ -102,22 +104,23 @@ ENABLED_SERVICES+=,designate,designate-central,designate-api,designate-pool-mana
|
||||
# Other Devstack Config
|
||||
# =====================
|
||||
# Optional TLS Proxy
|
||||
#ENABLED_SERVICES+=,tls-proxy
|
||||
#enable_service tls-proxy
|
||||
|
||||
# Optional Tempest
|
||||
#ENABLED_SERVICES+=,tempest
|
||||
#enable_service tempest
|
||||
|
||||
# Optional Rally
|
||||
#ENABLED_SERVICES+=,rally
|
||||
#enable_service rally
|
||||
|
||||
# Optional Horizon
|
||||
#ENABLED_SERVICES+=,horizon
|
||||
#enable_service horizon
|
||||
|
||||
# Optional Glance
|
||||
#ENABLED_SERVICES+=,g-api,g-reg
|
||||
#enable_service g-api,g-reg
|
||||
|
||||
# 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
|
||||
#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
|
Loading…
Reference in New Issue
Block a user