From 64c46a96cb4f278921627142801f8acda799b68e Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Tue, 23 Sep 2014 11:09:31 +0200 Subject: [PATCH] labs: reorder setup_neutron_network.sh This patch reorders the content of setup_neutron_network.sh to more closely match the order of instructions in the install-guide, making it easier to compare script and instructions. Change-Id: Ifa5e23b3d9b0af321b907ab75bd62b171555750b Co-Authored-By: Pranav Salunke --- labs/scripts/setup_neutron_network.sh | 114 +++++++++++++------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/labs/scripts/setup_neutron_network.sh b/labs/scripts/setup_neutron_network.sh index f08faa7f..8a89132e 100755 --- a/labs/scripts/setup_neutron_network.sh +++ b/labs/scripts/setup_neutron_network.sh @@ -38,7 +38,15 @@ echo "Configuring $conf." # Configuring [DEFAULT] section iniset_sudo $conf DEFAULT auth_strategy keystone -iniset_sudo $conf DEFAULT verbose True + +# Configuring [keystone_authtoken] section +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_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_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 @@ -50,14 +58,50 @@ iniset_sudo $conf DEFAULT core_plugin ml2 iniset_sudo $conf DEFAULT service_plugins router iniset_sudo $conf DEFAULT allow_overlapping_ips True -# Configuring [keystone_authtoken] section -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_port 35357 -iniset_sudo $conf keystone_authtoken auth_protocol http -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" +iniset_sudo $conf DEFAULT verbose True + +echo "Configuring Layer-3 agent." +conf=/etc/neutron/l3_agent.ini +iniset_sudo $conf DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver +iniset_sudo $conf DEFAULT use_namespaces True +iniset_sudo $conf DEFAULT verbose True + +echo "Configuring the DHCP agent" +conf=/etc/neutron/dhcp_agent.ini +iniset_sudo $conf DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver +iniset_sudo $conf DEFAULT dhcp_driver neutron.agent.linux.dhcp.Dnsmasq +iniset_sudo $conf DEFAULT use_namespaces True +iniset_sudo $conf DEFAULT verbose True +iniset_sudo $conf DEFAULT dnsmasq_config_file /etc/neutron/dnsmasq-neutron.conf +if [ -n "${TENANT_VM_DNS_SERVER:-''}" ]; then + iniset_sudo $conf DEFAULT dnsmasq_dns_servers "$TENANT_VM_DNS_SERVER" +fi + +cat << DNSMASQ | sudo tee /etc/neutron/dnsmasq-neutron.conf +# Set interface MTU to 1454 (for instance, ssh authentication may fail +# otherwise due to GRE overhead) +dhcp-option-force=26,1454 + +# Override --no-hosts dnsmasq option supplied by neutron +addn-hosts=/etc/hosts + +# Log dnsmasq queries to syslog +log-queries + +# Verbose logging for DHCP +log-dhcp +DNSMASQ +killall dnsmasq + +echo "Configuring the metadata agent" +conf=/etc/neutron/metadata_agent.ini +iniset_sudo $conf DEFAULT auth_url http://controller-mgmt:5000/v2.0 +iniset_sudo $conf DEFAULT auth_region regionOne +iniset_sudo $conf DEFAULT admin_tenant_name "$SERVICE_TENANT_NAME" +iniset_sudo $conf DEFAULT admin_user "$neutron_admin_user" +iniset_sudo $conf DEFAULT admin_password "$neutron_admin_password" +iniset_sudo $conf DEFAULT nova_metadata_ip "$(hostname_to_ip controller-mgmt)" +iniset_sudo $conf DEFAULT metadata_proxy_shared_secret "$METADATA_SECRET" echo "Configuring the OVS plug-in to use GRE tunneling." conf=/etc/neutron/plugins/ml2/ml2_conf.ini @@ -70,15 +114,15 @@ 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 firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver -iniset_sudo $conf securitygroup enable_security_group True - # 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 +# Under the securitygroup section +iniset_sudo $conf securitygroup firewall_driver neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver +iniset_sudo $conf securitygroup enable_security_group True + echo "Restarting the Open vSwitch (OVS) service." sudo service openvswitch-switch restart @@ -110,50 +154,6 @@ INTERFACES # Check if we can get to the API network again ping -c 1 controller-api -echo "Configuring Layer-3 agent." -conf=/etc/neutron/l3_agent.ini -iniset_sudo $conf DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver -iniset_sudo $conf DEFAULT use_namespaces True -iniset_sudo $conf DEFAULT verbose True - -echo "Configuring the metadata agent" -conf=/etc/neutron/metadata_agent.ini -iniset_sudo $conf DEFAULT auth_url http://controller-mgmt:5000/v2.0 -iniset_sudo $conf DEFAULT auth_region regionOne -iniset_sudo $conf DEFAULT admin_tenant_name "$SERVICE_TENANT_NAME" -iniset_sudo $conf DEFAULT admin_user "$neutron_admin_user" -iniset_sudo $conf DEFAULT admin_password "$neutron_admin_password" -iniset_sudo $conf DEFAULT nova_metadata_ip "$(hostname_to_ip controller-mgmt)" -iniset_sudo $conf DEFAULT metadata_proxy_shared_secret "$METADATA_SECRET" - -echo "Configuring the DHCP agent" -conf=/etc/neutron/dhcp_agent.ini -iniset_sudo $conf DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver -iniset_sudo $conf DEFAULT dhcp_driver neutron.agent.linux.dhcp.Dnsmasq -iniset_sudo $conf DEFAULT use_namespaces True -iniset_sudo $conf DEFAULT verbose True -iniset_sudo $conf DEFAULT dnsmasq_config_file /etc/neutron/dnsmasq-neutron.conf - -if [ -n "${TENANT_VM_DNS_SERVER:-''}" ]; then - iniset_sudo $conf DEFAULT dnsmasq_dns_servers "$TENANT_VM_DNS_SERVER" -fi - -cat << DNSMASQ | sudo tee /etc/neutron/dnsmasq-neutron.conf -# Set interface MTU to 1454 (for instance, ssh authentication may fail -# otherwise due to GRE overhead) -dhcp-option-force=26,1454 - -# Override --no-hosts dnsmasq option supplied by neutron -addn-hosts=/etc/hosts - -# Log dnsmasq queries to syslog -log-queries - -# Verbose logging for DHCP -log-dhcp -DNSMASQ -killall dnsmasq - echo "Restarting the network service." sudo service neutron-plugin-openvswitch-agent restart sudo service neutron-l3-agent restart