openstack/magnum
Code Issues Proposed changes

Merge "devstack: Comment out some environment dependent neutron settings"

Browse Source
This commit is contained in:
Jenkins 2016-03-13 14:58:36 +00:00 committed by Gerrit Code Review
commit 4256e8780e
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/README.rst
View File

@ -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

16
devstack/settings
View File

@ -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

20
doc/source/dev/manual-devstack.rst
View File

@ -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