From f448f12ff889441dd7aafc534d262c281fa55593 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 23 Feb 2016 15:52:53 +0900 Subject: [PATCH] devstack: Comment out some environment dependent neutron settings Also, update documentation. Change-Id: Iceb1c2a6957b5145ce2d94bcbeaffcf6ed3baff7 --- devstack/README.rst | 6 ++++++ devstack/settings | 16 +++++++--------- doc/source/dev/manual-devstack.rst | 20 ++++++-------------- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/devstack/README.rst b/devstack/README.rst index 9f58f63ee7..a009ec4913 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -21,7 +21,13 @@ magnum plugin:: enable_plugin magnum https://github.com/openstack/magnum master END +Additionally, you might need additional Neutron configurations for +your environment. +Please refer to the devstack documentation [#devstack_neutron]_ for details. + Then run devstack normally:: cd /opt/stack/devstack ./stack.sh + +.. [#devstack_neutron] http://docs.openstack.org/developer/devstack/guides/neutron.html diff --git a/devstack/settings b/devstack/settings index dca8238765..41858586bd 100644 --- a/devstack/settings +++ b/devstack/settings @@ -8,15 +8,12 @@ ## Log all output to files # LOGFILE=$HOME/devstack.log # SCREEN_LOGDIR=$HOME/logs - -# Neutron settings -Q_USE_SECGROUP=True -ENABLE_TENANT_VLANS=True -TENANT_VLAN_RANGE= -PHYSICAL_NETWORK=public -OVS_PHYSICAL_BRIDGE=br-ex - -enable_service rabbit +## Neutron settings +# Q_USE_SECGROUP=True +# ENABLE_TENANT_VLANS=True +# TENANT_VLAN_RANGE= +# PHYSICAL_NETWORK=public +# OVS_PHYSICAL_BRIDGE=br-ex # Enable Neutron which is required by Magnum and disable nova-network. disable_service n-net @@ -25,6 +22,7 @@ enable_service q-agt enable_service q-dhcp enable_service q-l3 enable_service q-meta +# Note: Default template uses LBaaS. enable_service q-lbaas enable_service neutron diff --git a/doc/source/dev/manual-devstack.rst b/doc/source/dev/manual-devstack.rst index 274d329dea..41451d3b09 100644 --- a/doc/source/dev/manual-devstack.rst +++ b/doc/source/dev/manual-devstack.rst @@ -27,9 +27,14 @@ and neutron:: cat > local.conf << END [[local|localrc]] # Modify to your environment + FIXED_RANGE=10.0.0.0/24 FLOATING_RANGE=192.168.1.224/27 PUBLIC_NETWORK_GATEWAY=192.168.1.225 PUBLIC_INTERFACE=em1 + PHYSICAL_NETWORK=public + OVS_PHYSICAL_BRIDGE=br-ex + ENABLE_TENANT_VLANS=True + TENANT_VLAN_RANGE=1000:1999 # Credentials ADMIN_PASSWORD=password @@ -41,13 +46,13 @@ and neutron:: enable_service rabbit # Ensure we are using neutron networking rather than nova networking - # (Neutron is enabled by default since Kilo) disable_service n-net enable_service q-svc enable_service q-agt enable_service q-dhcp enable_service q-l3 enable_service q-meta + # Note: Default template uses LBaaS. enable_service q-lbaas enable_service neutron @@ -60,19 +65,6 @@ and neutron:: # Enable barbican services enable_plugin barbican https://git.openstack.org/openstack/barbican - FIXED_RANGE=10.0.0.0/24 - - Q_USE_SECGROUP=True - ENABLE_TENANT_VLANS=True - TENANT_VLAN_RANGE= - - PHYSICAL_NETWORK=public - OVS_PHYSICAL_BRIDGE=br-ex - - # Log all output to files - LOGFILE=$HOME/logs/devstack.log - SCREEN_LOGDIR=$HOME/logs - VOLUME_BACKING_FILE_SIZE=20G END