openstack
/
tacker
Code Issues Proposed changes

Clears the devstack settings whitespaces 

Change-Id: I51cbcf6ed157582ae024eaee98b170f0e2063ce3
This commit is contained in:
Kanagaraj Manickam 2016-07-08 05:08:53 +05:30
parent cf2c9fca49
commit 8476b864bb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
devstack/settings
View File

@ -3,10 +3,10 @@ if [ "${TACKER_MODE}" == "all" ]; then
# Nova
disable_service n-net
VIRT_DRIVER=libvirt
#enable_service q-lbaas
#enable_service q-fwaas
# TACKER_NEUTRON_AGENTS can be disabled by adding
# TACKER_NEUTRON_AGENTS='' in local.conf if neutron agents are running on a separate node
TACKER_NEUTRON_AGENTS=${TACKER_NEUTRON_AGENTS:-q-agt,q-dhcp,q-meta,q-l3}
@ -14,22 +14,22 @@ if [ "${TACKER_MODE}" == "all" ]; then
do
enable_service $i
done
enable_service q-svc
enable_service neutron
# Heat
enable_service heat
enable_service h-eng
enable_service h-api
enable_service h-api-cfn
enable_service h-api-cw
enable_service tacker
# tacker-horizon isn't installable from pip
LIBS_FROM_GIT=tacker-horizon
MGMT_PHYS_NET=${MGMT_PHYS_NET:-mgmtphysnet0}
BR_MGMT=${BR_MGMT:-br-mgmt0}
NET_MGMT=${NET_MGMT:-net_mgmt}
@ -37,12 +37,12 @@ if [ "${TACKER_MODE}" == "all" ]; then
FIXED_RANGE_MGMT=${FIXED_RANGE_MGMT:-192.168.120.0/24}
NETWORK_GATEWAY_MGMT=${NETWORK_GATEWAY_MGMT:-192.168.120.1}
NETWORK_GATEWAY_MGMT_IP=${NETWORK_GATEWAY_MGMT_IP:-192.168.120.1/24}
NET0=${NET0:-net0}
SUBNET0=${SUBNET0:-subnet0}
FIXED_RANGE0=${FIXED_RANGE0:-10.10.0.0/24}
NETWORK_GATEWAY0=${NETWORK_GATEWAY0:-10.10.0.1}
NET1=${NET1:-net1}
SUBNET1=${SUBNET1:-subnet1}
FIXED_RANGE1=${FIXED_RANGE1:-10.10.1.0/24}