devstack: Comment out some environment dependent neutron settings
Also, update documentation. Change-Id: Iceb1c2a6957b5145ce2d94bcbeaffcf6ed3baff7
This commit is contained in:
parent
7b1c040716
commit
f448f12ff8
|
@ -21,7 +21,13 @@ magnum plugin::
|
||||||
enable_plugin magnum https://github.com/openstack/magnum master
|
enable_plugin magnum https://github.com/openstack/magnum master
|
||||||
END
|
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::
|
Then run devstack normally::
|
||||||
|
|
||||||
cd /opt/stack/devstack
|
cd /opt/stack/devstack
|
||||||
./stack.sh
|
./stack.sh
|
||||||
|
|
||||||
|
.. [#devstack_neutron] http://docs.openstack.org/developer/devstack/guides/neutron.html
|
||||||
|
|
|
@ -8,15 +8,12 @@
|
||||||
## Log all output to files
|
## Log all output to files
|
||||||
# LOGFILE=$HOME/devstack.log
|
# LOGFILE=$HOME/devstack.log
|
||||||
# SCREEN_LOGDIR=$HOME/logs
|
# SCREEN_LOGDIR=$HOME/logs
|
||||||
|
## Neutron settings
|
||||||
# Neutron settings
|
# Q_USE_SECGROUP=True
|
||||||
Q_USE_SECGROUP=True
|
# ENABLE_TENANT_VLANS=True
|
||||||
ENABLE_TENANT_VLANS=True
|
# TENANT_VLAN_RANGE=
|
||||||
TENANT_VLAN_RANGE=
|
# PHYSICAL_NETWORK=public
|
||||||
PHYSICAL_NETWORK=public
|
# OVS_PHYSICAL_BRIDGE=br-ex
|
||||||
OVS_PHYSICAL_BRIDGE=br-ex
|
|
||||||
|
|
||||||
enable_service rabbit
|
|
||||||
|
|
||||||
# Enable Neutron which is required by Magnum and disable nova-network.
|
# Enable Neutron which is required by Magnum and disable nova-network.
|
||||||
disable_service n-net
|
disable_service n-net
|
||||||
|
@ -25,6 +22,7 @@ enable_service q-agt
|
||||||
enable_service q-dhcp
|
enable_service q-dhcp
|
||||||
enable_service q-l3
|
enable_service q-l3
|
||||||
enable_service q-meta
|
enable_service q-meta
|
||||||
|
# Note: Default template uses LBaaS.
|
||||||
enable_service q-lbaas
|
enable_service q-lbaas
|
||||||
enable_service neutron
|
enable_service neutron
|
||||||
|
|
||||||
|
|
|
@ -27,9 +27,14 @@ and neutron::
|
||||||
cat > local.conf << END
|
cat > local.conf << END
|
||||||
[[local|localrc]]
|
[[local|localrc]]
|
||||||
# Modify to your environment
|
# Modify to your environment
|
||||||
|
FIXED_RANGE=10.0.0.0/24
|
||||||
FLOATING_RANGE=192.168.1.224/27
|
FLOATING_RANGE=192.168.1.224/27
|
||||||
PUBLIC_NETWORK_GATEWAY=192.168.1.225
|
PUBLIC_NETWORK_GATEWAY=192.168.1.225
|
||||||
PUBLIC_INTERFACE=em1
|
PUBLIC_INTERFACE=em1
|
||||||
|
PHYSICAL_NETWORK=public
|
||||||
|
OVS_PHYSICAL_BRIDGE=br-ex
|
||||||
|
ENABLE_TENANT_VLANS=True
|
||||||
|
TENANT_VLAN_RANGE=1000:1999
|
||||||
|
|
||||||
# Credentials
|
# Credentials
|
||||||
ADMIN_PASSWORD=password
|
ADMIN_PASSWORD=password
|
||||||
|
@ -41,13 +46,13 @@ and neutron::
|
||||||
enable_service rabbit
|
enable_service rabbit
|
||||||
|
|
||||||
# Ensure we are using neutron networking rather than nova networking
|
# Ensure we are using neutron networking rather than nova networking
|
||||||
# (Neutron is enabled by default since Kilo)
|
|
||||||
disable_service n-net
|
disable_service n-net
|
||||||
enable_service q-svc
|
enable_service q-svc
|
||||||
enable_service q-agt
|
enable_service q-agt
|
||||||
enable_service q-dhcp
|
enable_service q-dhcp
|
||||||
enable_service q-l3
|
enable_service q-l3
|
||||||
enable_service q-meta
|
enable_service q-meta
|
||||||
|
# Note: Default template uses LBaaS.
|
||||||
enable_service q-lbaas
|
enable_service q-lbaas
|
||||||
enable_service neutron
|
enable_service neutron
|
||||||
|
|
||||||
|
@ -60,19 +65,6 @@ and neutron::
|
||||||
# Enable barbican services
|
# Enable barbican services
|
||||||
enable_plugin barbican https://git.openstack.org/openstack/barbican
|
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
|
VOLUME_BACKING_FILE_SIZE=20G
|
||||||
END
|
END
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue