openstack/training-guides
Code Issues Proposed changes

Minor change to neutron controller script

Browse Source 
Moves nova related parameter to its respective location, does not
have any functional impacts. Also swaps auth_protocol with auth_port
to keep it in sync with install guides. Classifies ml2 sections by
adding comments.

Change-Id: I7739451f2959099e2b9485b2e0adbe721a9edfd7
This commit is contained in:
Pranav Salunke
2014-09-04 11:28:50 +05:30
parent be4f3543c8
commit 12f537e03d
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
labs/scripts/setup_neutron_controller.sh
View File

@@ -62,10 +62,10 @@ iniset_sudo $conf DEFAULT auth_strategy keystone
iniset_sudo $conf DEFAULT rpc_backend neutron.openstack.common.rpc.impl_kombu 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_host controller-mgmt
iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD" iniset_sudo $conf DEFAULT rabbit_password "$RABBIT_PASSWORD"
iniset_sudo $conf DEFAULT notify_nova_on_port_status_changes True
iniset_sudo $conf DEFAULT notify_nova_on_port_data_changes True
# Configure nova related parameters # Configure nova related parameters
iniset_sudo $conf DEFAULT notify_nova_on_port_status_changes True
iniset_sudo $conf DEFAULT notify_nova_on_port_data_changes True
iniset_sudo $conf DEFAULT nova_url http://controller-mgmt:8774/v2 iniset_sudo $conf DEFAULT nova_url http://controller-mgmt:8774/v2
iniset_sudo $conf DEFAULT nova_admin_username "$nova_admin_user" iniset_sudo $conf DEFAULT nova_admin_username "$nova_admin_user"
iniset_sudo $conf DEFAULT nova_admin_tenant_id "$service_tenant_id" iniset_sudo $conf DEFAULT nova_admin_tenant_id "$service_tenant_id"
@@ -80,8 +80,8 @@ iniset_sudo $conf DEFAULT allow_overlapping_ips True
# Configuring [keystone_authtoken] section # Configuring [keystone_authtoken] section
iniset_sudo $conf keystone_authtoken auth_uri "http://controller-mgmt:5000" iniset_sudo $conf keystone_authtoken auth_uri "http://controller-mgmt:5000"
iniset_sudo $conf keystone_authtoken auth_host controller-mgmt iniset_sudo $conf keystone_authtoken auth_host controller-mgmt
iniset_sudo $conf keystone_authtoken auth_port 35357
iniset_sudo $conf keystone_authtoken auth_protocol http iniset_sudo $conf keystone_authtoken auth_protocol http
iniset_sudo $conf keystone_authtoken auth_port 35357
iniset_sudo $conf keystone_authtoken admin_tenant_name "$SERVICE_TENANT_NAME" 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_user "$neutron_admin_user"
iniset_sudo $conf keystone_authtoken admin_password "$neutron_admin_password" iniset_sudo $conf keystone_authtoken admin_password "$neutron_admin_password"
@@ -101,13 +101,20 @@ keystone endpoint-create \
echo "Configuring the OVS plug-in to use GRE tunneling." echo "Configuring the OVS plug-in to use GRE tunneling."
conf=/etc/neutron/plugins/ml2/ml2_conf.ini conf=/etc/neutron/plugins/ml2/ml2_conf.ini
# Edit the [ml2] section.
iniset_sudo $conf ml2 type_drivers gre iniset_sudo $conf ml2 type_drivers gre
iniset_sudo $conf ml2 tenant_network_types gre iniset_sudo $conf ml2 tenant_network_types gre
iniset_sudo $conf ml2 mechanism_drivers openvswitch iniset_sudo $conf ml2 mechanism_drivers openvswitch
# Edit the [ml2_type_gre] section.
iniset_sudo $conf ml2_type_gre tunnel_id_ranges 1:1000 iniset_sudo $conf ml2_type_gre tunnel_id_ranges 1:1000
# Edit the [securitygroup] section.
iniset_sudo $conf securitygroup firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver iniset_sudo $conf securitygroup firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
iniset_sudo $conf securitygroup enable_security_group True iniset_sudo $conf securitygroup enable_security_group True
echo "Configure Compute to use Networking" echo "Configure Compute to use Networking"
conf=/etc/nova/nova.conf conf=/etc/nova/nova.conf
iniset_sudo $conf DEFAULT network_api_class nova.network.neutronv2.api.API iniset_sudo $conf DEFAULT network_api_class nova.network.neutronv2.api.API