Reorder neutron_network to match Juno

Code Issues Proposed changes

Reorder neutron_network to match the Juno install-guide. No functional
changes.
Change-Id: I5d376fc3d2ce25485a60ca45e9ce198d6fb4ec9c

This commit is contained in:

Roger Luethi

2014年12月30日 16:39:56 +01:00

parent 139008586b

commit 3a3914e8f3

1 changed files with 26 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

52
labs/scripts/ubuntu/setup_neutron_network.sh

View File

@@ -11,7 +11,7 @@ indicate_current_auto

#------------------------------------------------------------------------------

# Set up OpenStack Networking (neutron) for network node.

# http://docs.openstack.org/icehouse/install-guide/install/apt/content/neutron-ml2-network-node.html

# http://docs.openstack.org/juno/install-guide/install/apt/content/neutron-network-node.html

#------------------------------------------------------------------------------

echo "Editing /etc/sysctl.conf: enable IP forwarding, disable RPF filter."

@@ -38,6 +38,11 @@ neutron_admin_password=$(service_to_user_password neutron)

conf=/etc/neutron/neutron.conf

echo "Configuring $conf."

# Configure AMQP parameters

iniset_sudo $conf DEFAULT rpc_backend neutron.openstack.common.rpc.impl_kombu

iniset_sudo $conf DEFAULT rabbit_host controller-mgmt

iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"

# Configuring [DEFAULT] section

iniset_sudo $conf DEFAULT auth_strategy keystone

@@ -50,11 +55,6 @@ iniset_sudo $conf keystone_authtoken admin_tenant_name "$SERVICE_TENANT_NAME"

iniset_sudo $conf keystone_authtoken admin_user "$neutron_admin_user"

iniset_sudo $conf keystone_authtoken admin_password "$neutron_admin_password"

# Configure AMQP parameters

iniset_sudo $conf DEFAULT rpc_backend neutron.openstack.common.rpc.impl_kombu

iniset_sudo $conf DEFAULT rabbit_host controller-mgmt

iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"

# Configure network plugin parameters

iniset_sudo $conf DEFAULT core_plugin ml2

iniset_sudo $conf DEFAULT service_plugins router

@@ -62,6 +62,26 @@ iniset_sudo $conf DEFAULT allow_overlapping_ips True

iniset_sudo $conf DEFAULT verbose True

echo "Configuring the OVS plug-in to use GRE tunneling."

conf=/etc/neutron/plugins/ml2/ml2_conf.ini

# Under the ml2 section

iniset_sudo $conf ml2 type_drivers gre

iniset_sudo $conf ml2 tenant_network_types gre

iniset_sudo $conf ml2 mechanism_drivers openvswitch

# Under the ml2_type_gre section

iniset_sudo $conf ml2_type_gre tunnel_id_ranges 1:1000

# Under the securitygroup section

iniset_sudo $conf securitygroup enable_security_group True

iniset_sudo $conf securitygroup firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver

# Under the ovs section

iniset_sudo $conf ovs local_ip "$(hostname_to_ip network-data)"

iniset_sudo $conf ovs tunnel_type gre

iniset_sudo $conf ovs enable_tunneling True

echo "Configuring Layer-3 agent."

conf=/etc/neutron/l3_agent.ini

iniset_sudo $conf DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver

@@ -114,26 +134,6 @@ iniset_sudo $conf DEFAULT verbose True

# service_neutron_metadata_proxy and neutron_metadata_proxy_shared_secret)

# are done in setup_neutron_controller.sh.