From 7879bff48dc6f2da9eaa11691295f4161fbac8d2 Mon Sep 17 00:00:00 2001 From: Endre Karlson Date: Fri, 4 Dec 2015 11:51:34 +0100 Subject: [PATCH] Switch devstack to use local.conf Change-Id: Iaa4aeeb551eefb27157fc48be8bff894b002f17e --- contrib/vagrant/Vagrantfile | 6 +++--- contrib/vagrant/{localrc => local.conf} | 27 ++++++++++++++----------- 2 files changed, 18 insertions(+), 15 deletions(-) rename contrib/vagrant/{localrc => local.conf} (84%) diff --git a/contrib/vagrant/Vagrantfile b/contrib/vagrant/Vagrantfile index a2d7bf50c..70f3680ae 100644 --- a/contrib/vagrant/Vagrantfile +++ b/contrib/vagrant/Vagrantfile @@ -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 diff --git a/contrib/vagrant/localrc b/contrib/vagrant/local.conf similarity index 84% rename from contrib/vagrant/localrc rename to contrib/vagrant/local.conf index bdcbf32d8..3b77a8830 100644 --- a/contrib/vagrant/localrc +++ b/contrib/vagrant/local.conf @@ -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