@@ -110,7 +110,7 @@ follows:

 * Global service configuration like ``ENABLED_SERVICES``

 * Variables used by multiple services that do not have a clear owner, i.e.

   ``VOLUME_BACKING_FILE_SIZE`` (nova-volumes and cinder) or ``PUBLIC_NETWORK_NAME``

-  (nova-network and quantum)

+  (nova-network and neutron)

 * Variables that can not be cleanly declared in a project file due to

   dependency ordering, i.e. the order of sourcing the project files can

   not be changed for other reasons but the earlier file needs to dereference a

@@ -104,11 +104,11 @@ If you are enabling `swift3` in `ENABLED_SERVICES` devstack will install the swi

 Only Swift proxy server is launched in the screen session all other services are started in background and managed by `swift-init` tool.

-# Quantum

+# Neutron

 Basic Setup

-In order to enable Quantum a single node setup, you'll need the following settings in your `localrc` :

+In order to enable Neutron a single node setup, you'll need the following settings in your `localrc` :

     disable_service n-net

     enable_service q-svc

@@ -116,13 +116,13 @@ In order to enable Quantum a single node setup, you'll need the following settin

     enable_service q-dhcp

     enable_service q-l3

     enable_service q-meta

-    enable_service quantum

+    enable_service neutron

     # Optional, to enable tempest configuration as part of devstack

     enable_service tempest

 Then run `stack.sh` as normal.

-devstack supports adding specific Quantum configuration flags to both the Open vSwitch and LinuxBridge plugin configuration files. To make use of this feature, the following variables are defined and can be configured in your `localrc` file:

+devstack supports adding specific Neutron configuration flags to both the Open vSwitch and LinuxBridge plugin configuration files. To make use of this feature, the following variables are defined and can be configured in your `localrc` file:

     Variable Name             Plugin Config File Section Modified

     -------------------------------------------------------------------------------------

@@ -144,7 +144,7 @@ If tempest has been successfully configured, a basic set of smoke tests can be r

 # Multi-Node Setup

-A more interesting setup involves running multiple compute nodes, with Quantum networks connecting VMs on different compute nodes.

+A more interesting setup involves running multiple compute nodes, with Neutron networks connecting VMs on different compute nodes.

 You should run at least one "controller node", which should have a `stackrc` that includes at least:

     disable_service n-net

@@ -153,7 +153,7 @@ You should run at least one "controller node", which should have a `stackrc` tha

     enable_service q-dhcp

     enable_service q-l3

     enable_service q-meta

-    enable_service quantum

+    enable_service neutron

 You likely want to change your `localrc` to run a scheduler that will balance VMs across hosts:

@@ -161,7 +161,7 @@ You likely want to change your `localrc` to run a scheduler that will balance VM

 You can then run many compute nodes, each of which should have a `stackrc` which includes the following, with the IP address of the above controller node:

-    ENABLED_SERVICES=n-cpu,rabbit,g-api,quantum,q-agt

+    ENABLED_SERVICES=n-cpu,rabbit,g-api,neutron,q-agt

     SERVICE_HOST=[IP of controller node]

     MYSQL_HOST=$SERVICE_HOST

     RABBIT_HOST=$SERVICE_HOST

@@ -42,7 +42,7 @@ source $TOP_DIR/lib/cinder

 source $TOP_DIR/lib/swift

 source $TOP_DIR/lib/ceilometer

 source $TOP_DIR/lib/heat

-source $TOP_DIR/lib/quantum

+source $TOP_DIR/lib/neutron

 source $TOP_DIR/lib/baremetal

 source $TOP_DIR/lib/ldap

@@ -60,7 +60,7 @@ cleanup_cinder

 cleanup_glance

 cleanup_keystone

 cleanup_nova

-cleanup_quantum

+cleanup_neutron

 cleanup_swift

 # cinder doesn't always clean up the volume group as it might be used elsewhere...

@@ -32,9 +32,9 @@ source $TOP_DIR/functions

 # Import configuration

 source $TOP_DIR/openrc

-# Import quantum functions if needed

-if is_service_enabled quantum; then

-    source $TOP_DIR/lib/quantum

+# Import neutron functions if needed

+if is_service_enabled neutron; then

+    source $TOP_DIR/lib/neutron

 fi

 # Import exercise configuration

@@ -33,9 +33,9 @@ source $TOP_DIR/functions

 # Import EC2 configuration

 source $TOP_DIR/eucarc

-# Import quantum functions if needed

-if is_service_enabled quantum; then

-    source $TOP_DIR/lib/quantum

+# Import neutron functions if needed

+if is_service_enabled neutron; then

+    source $TOP_DIR/lib/neutron

 fi

 # Import exercise configuration

@@ -30,9 +30,9 @@ source $TOP_DIR/functions

 # Import configuration

 source $TOP_DIR/openrc

-# Import quantum functions if needed

-if is_service_enabled quantum; then

-    source $TOP_DIR/lib/quantum

+# Import neutron functions if needed

+if is_service_enabled neutron; then

+    source $TOP_DIR/lib/neutron

 fi

 # Import exercise configuration

@@ -155,7 +155,7 @@ nova add-floating-ip $VM_UUID $FLOATING_IP || \

 # Test we can ping our floating IP within ASSOCIATE_TIMEOUT seconds

 ping_check "$PUBLIC_NETWORK_NAME" $FLOATING_IP $ASSOCIATE_TIMEOUT

-if ! is_service_enabled quantum; then

+if ! is_service_enabled neutron; then

     # Allocate an IP from second floating pool

     TEST_FLOATING_IP=$(nova floating-ip-create $TEST_FLOATING_POOL | grep $TEST_FLOATING_POOL | get_field 1)

     die_if_not_set $LINENO TEST_FLOATING_IP "Failure creating floating IP in $TEST_FLOATING_POOL"

@@ -179,7 +179,7 @@ fi

 # Clean up

 # --------

-if ! is_service_enabled quantum; then

+if ! is_service_enabled neutron; then

     # Delete second floating IP

     nova floating-ip-delete $TEST_FLOATING_IP || \

         die $LINENO "Failure deleting floating IP $TEST_FLOATING_IP"

@@ -1,9 +1,9 @@

 #!/usr/bin/env bash

 #

-# **quantum-adv-test.sh**

+# **neutron-adv-test.sh**

-# Perform integration testing of Nova and other components with Quantum.

+# Perform integration testing of Nova and other components with Neutron.

 echo "*********************************************************************"

 echo "Begin DevStack Exercise: $0"

@@ -43,16 +43,16 @@ source $TOP_DIR/functions

 # Import configuration

 source $TOP_DIR/openrc

-# Import quantum functions

-source $TOP_DIR/lib/quantum

+# Import neutron functions

+source $TOP_DIR/lib/neutron

-# If quantum is not enabled we exit with exitcode 55, which means exercise is skipped.

-quantum_plugin_check_adv_test_requirements || exit 55

+# If neutron is not enabled we exit with exitcode 55, which means exercise is skipped.

+neutron_plugin_check_adv_test_requirements || exit 55

 # Import exercise configuration

 source $TOP_DIR/exerciserc

-# Quantum Settings

+# Neutron Settings

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

 TENANTS="DEMO1"

@@ -161,7 +161,7 @@ function get_role_id {

 function get_network_id {

     local NETWORK_NAME="$1"

-    local NETWORK_ID=`quantum net-list -F id  -- --name=$NETWORK_NAME | awk "NR==4" | awk '{print $2}'`

+    local NETWORK_ID=`neutron net-list -F id  -- --name=$NETWORK_NAME | awk "NR==4" | awk '{print $2}'`

     echo $NETWORK_ID

 }

@@ -232,9 +232,9 @@ function create_network {

     source $TOP_DIR/openrc admin admin

     local TENANT_ID=$(get_tenant_id $TENANT)

     source $TOP_DIR/openrc $TENANT $TENANT

-    local NET_ID=$(quantum net-create --tenant_id $TENANT_ID $NET_NAME $EXTRA| grep ' id ' | awk '{print $4}' )

-    quantum subnet-create --ip_version 4 --tenant_id $TENANT_ID --gateway $GATEWAY $NET_ID $CIDR

-    quantum-debug probe-create --device-owner compute $NET_ID

+    local NET_ID=$(neutron net-create --tenant_id $TENANT_ID $NET_NAME $EXTRA| grep ' id ' | awk '{print $4}' )

+    neutron subnet-create --ip_version 4 --tenant_id $TENANT_ID --gateway $GATEWAY $NET_ID $CIDR

+    neutron-debug probe-create --device-owner compute $NET_ID

     source $TOP_DIR/openrc demo demo

 }

@@ -320,10 +320,10 @@ function delete_network {

     local TENANT_ID=$(get_tenant_id $TENANT)

     #TODO(nati) comment out until l3-agent merged

     #for res in port subnet net router;do

-    for net_id in `quantum net-list -c id -c name | grep $NET_NAME | awk '{print $2}'`;do

+    for net_id in `neutron net-list -c id -c name | grep $NET_NAME | awk '{print $2}'`;do

         delete_probe $net_id

-        quantum subnet-list | grep $net_id | awk '{print $2}' | xargs -I% quantum subnet-delete %

-        quantum net-delete $net_id

+        neutron subnet-list | grep $net_id | awk '{print $2}' | xargs -I% neutron subnet-delete %

+        neutron net-delete $net_id

     done

     source $TOP_DIR/openrc demo demo

 }

@@ -30,9 +30,9 @@ source $TOP_DIR/functions

 # Import configuration

 source $TOP_DIR/openrc

-# Import quantum functions if needed

-if is_service_enabled quantum; then

-    source $TOP_DIR/lib/quantum

+# Import neutron functions if needed

+if is_service_enabled neutron; then

+    source $TOP_DIR/lib/neutron

 fi

 # Import exercise configuration

@@ -262,8 +262,8 @@ function get_packages() {

                 file_to_parse="${file_to_parse} keystone"

             fi

         elif [[ $service == q-* ]]; then

-            if [[ ! $file_to_parse =~ quantum ]]; then

-                file_to_parse="${file_to_parse} quantum"

+            if [[ ! $file_to_parse =~ neutron ]]; then

+                file_to_parse="${file_to_parse} neutron"

             fi

         fi

     done

@@ -717,7 +717,7 @@ function is_running() {

 #   **cinder** returns true if any service enabled start with **c-**

 #   **ceilometer** returns true if any service enabled start with **ceilometer**

 #   **glance** returns true if any service enabled start with **g-**

-#   **quantum** returns true if any service enabled start with **q-**

+#   **neutron** returns true if any service enabled start with **q-**

 #   **swift** returns true if any service enabled start with **s-**

 #   For backward compatibility if we have **swift** in ENABLED_SERVICES all the

 #   **s-** services will be enabled. This will be deprecated in the future.

@@ -732,7 +732,7 @@ function is_service_enabled() {

         [[ ${service} == "cinder" && ${ENABLED_SERVICES} =~ "c-" ]] && return 0

         [[ ${service} == "ceilometer" && ${ENABLED_SERVICES} =~ "ceilometer-" ]] && return 0

         [[ ${service} == "glance" && ${ENABLED_SERVICES} =~ "g-" ]] && return 0

-        [[ ${service} == "quantum" && ${ENABLED_SERVICES} =~ "q-" ]] && return 0

+        [[ ${service} == "neutron" && ${ENABLED_SERVICES} =~ "q-" ]] && return 0

         [[ ${service} == "swift" && ${ENABLED_SERVICES} =~ "s-" ]] && return 0

         [[ ${service} == s-* && ${ENABLED_SERVICES} =~ "swift" ]] && return 0

     done

@@ -758,7 +758,7 @@ function _cleanup_service_list () {

 #   enable_service qpid

 #

 # This function does not know about the special cases

-# for nova, glance, and quantum built into is_service_enabled().

+# for nova, glance, and neutron built into is_service_enabled().

 # Uses global ``ENABLED_SERVICES``

 # enable_service service [service ...]

 function enable_service() {

@@ -780,7 +780,7 @@ function enable_service() {

 #   disable_service rabbit

 #

 # This function does not know about the special cases

-# for nova, glance, and quantum built into is_service_enabled().

+# for nova, glance, and neutron built into is_service_enabled().

 # Uses global ``ENABLED_SERVICES``

 # disable_service service [service ...]

 function disable_service() {

@@ -1330,8 +1330,8 @@ function zypper_install() {

 # Uses globals ``ENABLED_SERVICES``

 # ping_check from-net ip boot-timeout expected

 function ping_check() {

-    if is_service_enabled quantum; then

-        _ping_check_quantum  "$1" $2 $3 $4

+    if is_service_enabled neutron; then

+        _ping_check_neutron  "$1" $2 $3 $4

         return

     fi

     _ping_check_novanet "$1" $2 $3 $4

@@ -1370,8 +1370,8 @@ function _ping_check_novanet() {

 # ssh_check net-name key-file floating-ip default-user active-timeout

 function ssh_check() {

-    if is_service_enabled quantum; then

-        _ssh_check_quantum  "$1" $2 $3 $4 $5

+    if is_service_enabled neutron; then

+        _ssh_check_neutron  "$1" $2 $3 $4 $5

         return

     fi

     _ssh_check_novanet "$1" $2 $3 $4 $5

@@ -151,12 +151,12 @@ function configure_keystone() {

             echo "catalog.RegionOne.object_store.name = Swift Service" >> $KEYSTONE_CATALOG

         fi

-        # Add quantum endpoints to service catalog if quantum is enabled

-        if is_service_enabled quantum; then

+        # Add neutron endpoints to service catalog if neutron is enabled

+        if is_service_enabled neutron; then

             echo "catalog.RegionOne.network.publicURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG

             echo "catalog.RegionOne.network.adminURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG

             echo "catalog.RegionOne.network.internalURL = http://%SERVICE_HOST%:$Q_PORT/" >> $KEYSTONE_CATALOG

-            echo "catalog.RegionOne.network.name = Quantum Service" >> $KEYSTONE_CATALOG

+            echo "catalog.RegionOne.network.name = Neutron Service" >> $KEYSTONE_CATALOG

         fi

         sed -e "

new file mode 100644

@@ -0,0 +1,815 @@

+# lib/neutron

+# functions - funstions specific to neutron

+

+# Dependencies:

+# ``functions`` file

+# ``DEST`` must be defined

+

+# ``stack.sh`` calls the entry points in this order:

+#

+# install_neutron

+# install_neutronclient

+# install_neutron_agent_packages

+# install_neutron_third_party

+# configure_neutron

+# init_neutron

+# configure_neutron_third_party

+# init_neutron_third_party

+# start_neutron_third_party

+# create_nova_conf_neutron

+# start_neutron_service_and_check

+# create_neutron_initial_network

+# setup_neutron_debug

+# start_neutron_agents

+#

+# ``unstack.sh`` calls the entry points in this order:

+#

+# stop_neutron

+

+# Functions in lib/neutron are classified into the following categories:

+#

+# - entry points (called from stack.sh or unstack.sh)

+# - internal functions

+# - neutron exercises

+# - 3rd party programs

+

+

+# Neutron Networking

+# ------------------

+

+# Make sure that neutron is enabled in ``ENABLED_SERVICES``.  If you want

+# to run Neutron on this host, make sure that q-svc is also in

+# ``ENABLED_SERVICES``.

+#

+# If you're planning to use the Neutron openvswitch plugin, set

+# ``Q_PLUGIN`` to "openvswitch" and make sure the q-agt service is enabled

+# in ``ENABLED_SERVICES``.  If you're planning to use the Neutron

+# linuxbridge plugin, set ``Q_PLUGIN`` to "linuxbridge" and make sure the

+# q-agt service is enabled in ``ENABLED_SERVICES``.

+#

+# See "Neutron Network Configuration" below for additional variables

+# that must be set in localrc for connectivity across hosts with

+# Neutron.

+#

+# With Neutron networking the NETWORK_MANAGER variable is ignored.

+#

+# To enable specific configuration options for either the Open vSwitch or

+# LinuxBridge plugin, please see the top level README file under the

+# Neutron section.

+

+# Save trace setting

+XTRACE=$(set +o | grep xtrace)

+set +o xtrace

+

+

+# Neutron Network Configuration

+# -----------------------------

+

+# Gateway and subnet defaults, in case they are not customized in localrc

+NETWORK_GATEWAY=${NETWORK_GATEWAY:-10.0.0.1}

+PUBLIC_NETWORK_GATEWAY=${PUBLIC_NETWORK_GATEWAY:-172.24.4.225}

+PRIVATE_SUBNET_NAME=${PRIVATE_SUBNET_NAME:-"private-subnet"}

+PUBLIC_SUBNET_NAME=${PUBLIC_SUBNET_NAME:-"public-subnet"}

+

+# Set up default directories

+NEUTRON_DIR=$DEST/neutron

+NEUTRONCLIENT_DIR=$DEST/python-neutronclient

+NEUTRON_AUTH_CACHE_DIR=${NEUTRON_AUTH_CACHE_DIR:-/var/cache/neutron}

+

+# Support entry points installation of console scripts

+if [[ -d $NEUTRON_DIR/bin/neutron-server ]]; then

+    NEUTRON_BIN_DIR=$NEUTRON_DIR/bin

+     else

+NEUTRON_BIN_DIR=$(get_python_exec_prefix)

+fi

+

+NEUTRON_CONF_DIR=/etc/neutron

+NEUTRON_CONF=$NEUTRON_CONF_DIR/neutron.conf

+export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}

+

+# Default Neutron Plugin

+Q_PLUGIN=${Q_PLUGIN:-openvswitch}

+# Default Neutron Port

+Q_PORT=${Q_PORT:-9696}

+# Default Neutron Host

+Q_HOST=${Q_HOST:-$SERVICE_HOST}

+# Default admin username

+Q_ADMIN_USERNAME=${Q_ADMIN_USERNAME:-neutron}

+# Default auth strategy

+Q_AUTH_STRATEGY=${Q_AUTH_STRATEGY:-keystone}

+# Use namespace or not

+Q_USE_NAMESPACE=${Q_USE_NAMESPACE:-True}

+# RHEL's support for namespaces requires using veths with ovs

+Q_OVS_USE_VETH=${Q_OVS_USE_VETH:-False}

+Q_USE_ROOTWRAP=${Q_USE_ROOTWRAP:-True}

+# Meta data IP

+Q_META_DATA_IP=${Q_META_DATA_IP:-$SERVICE_HOST}

+# Allow Overlapping IP among subnets

+Q_ALLOW_OVERLAPPING_IP=${Q_ALLOW_OVERLAPPING_IP:-True}

+# Use neutron-debug command

+Q_USE_DEBUG_COMMAND=${Q_USE_DEBUG_COMMAND:-False}

+# The name of the default q-l3 router

+Q_ROUTER_NAME=${Q_ROUTER_NAME:-router1}

+# List of config file names in addition to the main plugin config file

+# See _configure_neutron_common() for details about setting it up

+declare -a Q_PLUGIN_EXTRA_CONF_FILES

+

+if is_service_enabled neutron; then

+    Q_RR_CONF_FILE=$NEUTRON_CONF_DIR/rootwrap.conf

+    if [[ "$Q_USE_ROOTWRAP" == "False" ]]; then

+        Q_RR_COMMAND="sudo"

+    else

+        NEUTRON_ROOTWRAP=$(get_rootwrap_location neutron)

+        Q_RR_COMMAND="sudo $NEUTRON_ROOTWRAP $Q_RR_CONF_FILE"

+    fi

+

+    # Provider Network Configurations

+    # --------------------------------

+

+    # The following variables control the Neutron openvswitch and

+    # linuxbridge plugins' allocation of tenant networks and

+    # availability of provider networks. If these are not configured

+    # in ``localrc``, tenant networks will be local to the host (with no

+    # remote connectivity), and no physical resources will be

+    # available for the allocation of provider networks.

+

+    # To use GRE tunnels for tenant networks, set to True in

+    # ``localrc``. GRE tunnels are only supported by the openvswitch

+    # plugin, and currently only on Ubuntu.

+    ENABLE_TENANT_TUNNELS=${ENABLE_TENANT_TUNNELS:-False}

+

+    # If using GRE tunnels for tenant networks, specify the range of

+    # tunnel IDs from which tenant networks are allocated. Can be

+    # overriden in ``localrc`` in necesssary.

+    TENANT_TUNNEL_RANGES=${TENANT_TUNNEL_RANGE:-1:1000}

+

+    # To use VLANs for tenant networks, set to True in localrc. VLANs

+    # are supported by the openvswitch and linuxbridge plugins, each

+    # requiring additional configuration described below.

+    ENABLE_TENANT_VLANS=${ENABLE_TENANT_VLANS:-False}

+

+    # If using VLANs for tenant networks, set in ``localrc`` to specify

+    # the range of VLAN VIDs from which tenant networks are

+    # allocated. An external network switch must be configured to

+    # trunk these VLANs between hosts for multi-host connectivity.

+    #

+    # Example: ``TENANT_VLAN_RANGE=1000:1999``

+    TENANT_VLAN_RANGE=${TENANT_VLAN_RANGE:-}

+

+    # If using VLANs for tenant networks, or if using flat or VLAN

+    # provider networks, set in ``localrc`` to the name of the physical

+    # network, and also configure ``OVS_PHYSICAL_BRIDGE`` for the

+    # openvswitch agent or ``LB_PHYSICAL_INTERFACE`` for the linuxbridge

+    # agent, as described below.

+    #

+    # Example: ``PHYSICAL_NETWORK=default``

+    PHYSICAL_NETWORK=${PHYSICAL_NETWORK:-}

+

+    # With the openvswitch plugin, if using VLANs for tenant networks,

+    # or if using flat or VLAN provider networks, set in ``localrc`` to

+    # the name of the OVS bridge to use for the physical network. The

+    # bridge will be created if it does not already exist, but a

+    # physical interface must be manually added to the bridge as a

+    # port for external connectivity.

+    #

+    # Example: ``OVS_PHYSICAL_BRIDGE=br-eth1``

+    OVS_PHYSICAL_BRIDGE=${OVS_PHYSICAL_BRIDGE:-}

+

+    # With the linuxbridge plugin, if using VLANs for tenant networks,

+    # or if using flat or VLAN provider networks, set in ``localrc`` to

+    # the name of the network interface to use for the physical

+    # network.

+    #

+    # Example: ``LB_PHYSICAL_INTERFACE=eth1``

+    LB_PHYSICAL_INTERFACE=${LB_PHYSICAL_INTERFACE:-}

+

+    # With the openvswitch plugin, set to True in ``localrc`` to enable

+    # provider GRE tunnels when ``ENABLE_TENANT_TUNNELS`` is False.

+    #

+    # Example: ``OVS_ENABLE_TUNNELING=True``

+    OVS_ENABLE_TUNNELING=${OVS_ENABLE_TUNNELING:-$ENABLE_TENANT_TUNNELS}

+fi

+

+# Neutron plugin specific functions

+# ---------------------------------

+

+# Please refer to ``lib/neutron_plugins/README.md`` for details.

+source $TOP_DIR/lib/neutron_plugins/$Q_PLUGIN

+

+# Agent loadbalancer service plugin functions

+# -------------------------------------------

+

+# Hardcoding for 1 service plugin for now

+source $TOP_DIR/lib/neutron_plugins/services/loadbalancer

+

+# Use security group or not

+if has_neutron_plugin_security_group; then

+    Q_USE_SECGROUP=${Q_USE_SECGROUP:-True}

+else

+    Q_USE_SECGROUP=False

+fi

+

+# Functions

+# ---------

+

+# configure_neutron()

+# Set common config for all neutron server and agents.

+function configure_neutron() {

+    _configure_neutron_common

+    iniset_rpc_backend neutron $NEUTRON_CONF DEFAULT

+

+    # goes before q-svc to init Q_SERVICE_PLUGIN_CLASSES

+    if is_service_enabled q-lbaas; then

+        _configure_neutron_lbaas

+    fi

+    if is_service_enabled q-svc; then

+        _configure_neutron_service

+    fi

+    if is_service_enabled q-agt; then

+        _configure_neutron_plugin_agent

+    fi

+    if is_service_enabled q-dhcp; then

+        _configure_neutron_dhcp_agent

+    fi

+    if is_service_enabled q-l3; then

+        _configure_neutron_l3_agent

+    fi

+    if is_service_enabled q-meta; then

+        _configure_neutron_metadata_agent

+    fi

+

+    _configure_neutron_debug_command

+}

+

+function create_nova_conf_neutron() {

+    iniset $NOVA_CONF DEFAULT network_api_class "nova.network.quantumv2.api.API"

+    iniset $NOVA_CONF DEFAULT quantum_admin_username "$Q_ADMIN_USERNAME"

+    iniset $NOVA_CONF DEFAULT quantum_admin_password "$SERVICE_PASSWORD"

+    iniset $NOVA_CONF DEFAULT quantum_admin_auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v2.0"

+    iniset $NOVA_CONF DEFAULT quantum_auth_strategy "$Q_AUTH_STRATEGY"

+    iniset $NOVA_CONF DEFAULT quantum_admin_tenant_name "$SERVICE_TENANT_NAME"

+    iniset $NOVA_CONF DEFAULT quantum_url "http://$Q_HOST:$Q_PORT"

+

+    if [[ "$Q_USE_SECGROUP" == "True" ]]; then

+        LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver

+        iniset $NOVA_CONF DEFAULT security_group_api quantum

+    fi

+

+    # set NOVA_VIF_DRIVER and optionally set options in nova_conf

+    neutron_plugin_create_nova_conf

+

+    iniset $NOVA_CONF DEFAULT libvirt_vif_driver "$NOVA_VIF_DRIVER"

+    iniset $NOVA_CONF DEFAULT linuxnet_interface_driver "$LINUXNET_VIF_DRIVER"

+    if is_service_enabled q-meta; then

+        iniset $NOVA_CONF DEFAULT service_quantum_metadata_proxy "True"

+    fi

+}

+

+# create_neutron_accounts() - Set up common required neutron accounts

+

+# Tenant               User       Roles

+# ------------------------------------------------------------------

+# service              neutron    admin        # if enabled

+

+# Migrated from keystone_data.sh

+function create_neutron_accounts() {

+

+    SERVICE_TENANT=$(keystone tenant-list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")

+    ADMIN_ROLE=$(keystone role-list | awk "/ admin / { print \$2 }")

+

+    if [[ "$ENABLED_SERVICES" =~ "q-svc" ]]; then

+        NEUTRON_USER=$(keystone user-create \

+            --name=neutron \

+            --pass="$SERVICE_PASSWORD" \

+            --tenant_id $SERVICE_TENANT \

+            --email=neutron@example.com \

+            | grep " id " | get_field 2)

+        keystone user-role-add \

+            --tenant_id $SERVICE_TENANT \

+            --user_id $NEUTRON_USER \

+            --role_id $ADMIN_ROLE

+        if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then

+            NEUTRON_SERVICE=$(keystone service-create \

+                --name=neutron \

+                --type=network \

+                --description="Neutron Service" \

+                | grep " id " | get_field 2)

+            keystone endpoint-create \

+                --region RegionOne \

+                --service_id $NEUTRON_SERVICE \

+                --publicurl "http://$SERVICE_HOST:9696/" \

+                --adminurl "http://$SERVICE_HOST:9696/" \

+                --internalurl "http://$SERVICE_HOST:9696/"

+        fi

+    fi

+}

+

+function create_neutron_initial_network() {

+    TENANT_ID=$(keystone tenant-list | grep " demo " | get_field 1)

+

+    # Create a small network

+    # Since neutron command is executed in admin context at this point,

+    # ``--tenant_id`` needs to be specified.

+    if is_baremetal; then

+        sudo ovs-vsctl add-port $OVS_PHYSICAL_BRIDGE $PUBLIC_INTERFACE

+        for IP in $(ip addr show dev $PUBLIC_INTERFACE | grep ' inet ' | awk '{print $2}'); do

+            sudo ip addr del $IP dev $PUBLIC_INTERFACE

+            sudo ip addr add $IP dev $OVS_PHYSICAL_BRIDGE

+        done

+        NET_ID=$(neutron net-create $PHYSICAL_NETWORK --tenant_id $TENANT_ID --provider:network_type flat --provider:physical_network "$PHYSICAL_NETWORK" | grep ' id ' | get_field 2)

+        SUBNET_ID=$(neutron subnet-create --tenant_id $TENANT_ID --ip_version 4 ${ALLOCATION_POOL:+--allocation-pool $ALLOCATION_POOL} --gateway $NETWORK_GATEWAY --name $PRIVATE_SUBNET_NAME $NET_ID $FIXED_RANGE | grep ' id ' | get_field 2)

+        sudo ifconfig $OVS_PHYSICAL_BRIDGE up

+    else

+        NET_ID=$(neutron net-create --tenant_id $TENANT_ID "$PRIVATE_NETWORK_NAME" | grep ' id ' | get_field 2)

+        SUBNET_ID=$(neutron subnet-create --tenant_id $TENANT_ID --ip_version 4 --gateway $NETWORK_GATEWAY --name $PRIVATE_SUBNET_NAME $NET_ID $FIXED_RANGE | grep ' id ' | get_field 2)

+    fi

+

+    if [[ "$Q_L3_ENABLED" == "True" ]]; then

+        # Create a router, and add the private subnet as one of its interfaces

+        if [[ "$Q_L3_ROUTER_PER_TENANT" == "True" ]]; then

+            # create a tenant-owned router.

+            ROUTER_ID=$(neutron router-create --tenant_id $TENANT_ID $Q_ROUTER_NAME | grep ' id ' | get_field 2)

+        else

+            # Plugin only supports creating a single router, which should be admin owned.

+            ROUTER_ID=$(neutron router-create $Q_ROUTER_NAME | grep ' id ' | get_field 2)

+        fi

+        neutron router-interface-add $ROUTER_ID $SUBNET_ID

+        # Create an external network, and a subnet. Configure the external network as router gw

+        EXT_NET_ID=$(neutron net-create "$PUBLIC_NETWORK_NAME" -- --router:external=True | grep ' id ' | get_field 2)

+        EXT_GW_IP=$(neutron subnet-create --ip_version 4 ${Q_FLOATING_ALLOCATION_POOL:+--allocation-pool $Q_FLOATING_ALLOCATION_POOL} --gateway $PUBLIC_NETWORK_GATEWAY --name $PUBLIC_SUBNET_NAME $EXT_NET_ID $FLOATING_RANGE -- --enable_dhcp=False | grep 'gateway_ip' | get_field 2)

+        neutron router-gateway-set $ROUTER_ID $EXT_NET_ID

+

+        if is_service_enabled q-l3; then

+            # logic is specific to using the l3-agent for l3

+            if is_neutron_ovs_base_plugin && [[ "$Q_USE_NAMESPACE" = "True" ]]; then

+                CIDR_LEN=${FLOATING_RANGE#*/}

+                sudo ip addr add $EXT_GW_IP/$CIDR_LEN dev $PUBLIC_BRIDGE

+                sudo ip link set $PUBLIC_BRIDGE up

+                ROUTER_GW_IP=`neutron port-list -c fixed_ips -c device_owner | grep router_gateway | awk -F '"' '{ print $8; }'`

+                sudo route add -net $FIXED_RANGE gw $ROUTER_GW_IP

+            fi

+            if [[ "$Q_USE_NAMESPACE" == "False" ]]; then

+                # Explicitly set router id in l3 agent configuration

+                iniset $Q_L3_CONF_FILE DEFAULT router_id $ROUTER_ID

+            fi

+        fi

+   fi

+}

+

+# init_neutron() - Initialize databases, etc.

+function init_neutron() {

+    :

+}

+

+# install_neutron() - Collect source and prepare

+function install_neutron() {

+    git_clone $NEUTRON_REPO $NEUTRON_DIR $NEUTRON_BRANCH

+    setup_develop $NEUTRON_DIR

+}

+

+# install_neutronclient() - Collect source and prepare

+function install_neutronclient() {

+    git_clone $NEUTRONCLIENT_REPO $NEUTRONCLIENT_DIR $NEUTRONCLIENT_BRANCH

+    setup_develop $NEUTRONCLIENT_DIR

+}

+

+# install_neutron_agent_packages() - Collect source and prepare

+function install_neutron_agent_packages() {

+    # install packages that are specific to plugin agent(s)

+    if is_service_enabled q-agt q-dhcp q-l3; then

+        neutron_plugin_install_agent_packages

+    fi

+

+    if is_service_enabled q-lbaas; then

+       neutron_agent_lbaas_install_agent_packages

+    fi

+}

+

+# Start running processes, including screen

+function start_neutron_service_and_check() {

+    # build config-file options

+    local cfg_file

+    local CFG_FILE_OPTIONS="--config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE"

+    for cfg_file in ${Q_PLUGIN_EXTRA_CONF_FILES[@]}; do

+         CFG_FILE_OPTIONS+=" --config-file /$cfg_file"

+    done

+    # Start the Neutron service

+    screen_it q-svc "cd $NEUTRON_DIR && python $NEUTRON_BIN_DIR/neutron-server $CFG_FILE_OPTIONS"

+    echo "Waiting for Neutron to start..."

+    if ! timeout $SERVICE_TIMEOUT sh -c "while ! http_proxy= wget -q -O- http://$Q_HOST:$Q_PORT; do sleep 1; done"; then

+      die $LINENO "Neutron did not start"

+    fi

+}

+

+# Start running processes, including screen

+function start_neutron_agents() {

+    # Start up the neutron agents if enabled

+    screen_it q-agt "cd $NEUTRON_DIR && python $AGENT_BINARY --config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE"

+    screen_it q-dhcp "cd $NEUTRON_DIR && python $AGENT_DHCP_BINARY --config-file $NEUTRON_CONF --config-file=$Q_DHCP_CONF_FILE"

+    screen_it q-l3 "cd $NEUTRON_DIR && python $AGENT_L3_BINARY --config-file $NEUTRON_CONF --config-file=$Q_L3_CONF_FILE"

+    screen_it q-meta "cd $NEUTRON_DIR && python $AGENT_META_BINARY --config-file $NEUTRON_CONF --config-file=$Q_META_CONF_FILE"

+

+    if [ "$VIRT_DRIVER" = 'xenserver' ]; then

+        # For XenServer, start an agent for the domU openvswitch

+        screen_it q-domua "cd $NEUTRON_DIR && python $AGENT_BINARY --config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE.domU"

+    fi

+

+    if is_service_enabled q-lbaas; then

+        screen_it q-lbaas "cd $NEUTRON_DIR && python $AGENT_LBAAS_BINARY --config-file $NEUTRON_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME"

+    fi

+}

+

+# stop_neutron() - Stop running processes (non-screen)

+function stop_neutron() {

+    if is_service_enabled q-dhcp; then

+        pid=$(ps aux | awk '/[d]nsmasq.+interface=(tap|ns-)/ { print $2 }')

+        [ ! -z "$pid" ] && sudo kill -9 $pid

+    fi

+    if is_service_enabled q-meta; then

+        pid=$(ps aux | awk '/neutron-ns-metadata-proxy/ { print $2 }')

+        [ ! -z "$pid" ] && sudo kill -9 $pid

+    fi

+}

+

+# cleanup_neutron() - Remove residual data files, anything left over from previous

+# runs that a clean run would need to clean up

+function cleanup_neutron() {

+    if is_neutron_ovs_base_plugin; then

+        neutron_ovs_base_cleanup

+    fi

+

+    # delete all namespaces created by neutron

+    for ns in $(sudo ip netns list | grep -o -e qdhcp-[0-9a-f\-]* -e qrouter-[0-9a-f\-]*); do

+        sudo ip netns delete ${ns}

+    done

+}

+

+# _configure_neutron_common()

+# Set common config for all neutron server and agents.

+# This MUST be called before other ``_configure_neutron_*`` functions.

+function _configure_neutron_common() {

+    # Put config files in ``NEUTRON_CONF_DIR`` for everyone to find

+    if [[ ! -d $NEUTRON_CONF_DIR ]]; then

+        sudo mkdir -p $NEUTRON_CONF_DIR

+    fi

+    sudo chown $STACK_USER $NEUTRON_CONF_DIR

+

+    cp $NEUTRON_DIR/etc/neutron.conf $NEUTRON_CONF

+

+    # Set plugin-specific variables ``Q_DB_NAME``, ``Q_PLUGIN_CLASS``.

+    # For main plugin config file, set ``Q_PLUGIN_CONF_PATH``, ``Q_PLUGIN_CONF_FILENAME``.

+    # For addition plugin config files, set ``Q_PLUGIN_EXTRA_CONF_PATH``,

+    # ``Q_PLUGIN_EXTRA_CONF_FILES``.  For example:

+    #    ``Q_PLUGIN_EXTRA_CONF_FILES=(file1, file2)``

+    neutron_plugin_configure_common

+

+    if [[ $Q_PLUGIN_CONF_PATH == '' || $Q_PLUGIN_CONF_FILENAME == '' || $Q_PLUGIN_CLASS == '' ]]; then

+        die $LINENO "Neutron plugin not set.. exiting"

+    fi

+

+    # If needed, move config file from ``$NEUTRON_DIR/etc/neutron`` to ``NEUTRON_CONF_DIR``

+    mkdir -p /$Q_PLUGIN_CONF_PATH

+    Q_PLUGIN_CONF_FILE=$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME

+    cp $NEUTRON_DIR/$Q_PLUGIN_CONF_FILE /$Q_PLUGIN_CONF_FILE

+

+    iniset /$Q_PLUGIN_CONF_FILE database connection `database_connection_url $Q_DB_NAME`

+    iniset $NEUTRON_CONF DEFAULT state_path $DATA_DIR/neutron

+

+    # If addition config files are set, make sure their path name is set as well

+    if [[ ${#Q_PLUGIN_EXTRA_CONF_FILES[@]} > 0 && $Q_PLUGIN_EXTRA_CONF_PATH == '' ]]; then

+        die $LINENO "Neutron additional plugin config not set.. exiting"

+    fi

+

+    # If additional config files exist, copy them over to neutron configuration

+    # directory

+    if [[ $Q_PLUGIN_EXTRA_CONF_PATH != '' ]]; then

+        mkdir -p /$Q_PLUGIN_EXTRA_CONF_PATH

+        local f

+        for (( f=0; $f < ${#Q_PLUGIN_EXTRA_CONF_FILES[@]}; f+=1 )); do

+            Q_PLUGIN_EXTRA_CONF_FILES[$f]=$Q_PLUGIN_EXTRA_CONF_PATH/${Q_PLUGIN_EXTRA_CONF_FILES[$f]}

+            cp $NEUTRON_DIR/${Q_PLUGIN_EXTRA_CONF_FILES[$f]} /${Q_PLUGIN_EXTRA_CONF_FILES[$f]}

+        done

+    fi

+

+    _neutron_setup_rootwrap

+}

+

+function _configure_neutron_debug_command() {

+    if [[ "$Q_USE_DEBUG_COMMAND" != "True" ]]; then

+        return

+    fi

+

+    cp $NEUTRON_DIR/etc/l3_agent.ini $NEUTRON_TEST_CONFIG_FILE

+

+    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT verbose False

+    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT debug False

+    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE

+    iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT root_helper "$Q_RR_COMMAND"

+    # Intermediate fix until Neutron patch lands and then line above will

+    # be cleaned.

+    iniset $NEUTRON_TEST_CONFIG_FILE agent root_helper "$Q_RR_COMMAND"

+

+    _neutron_setup_keystone $NEUTRON_TEST_CONFIG_FILE DEFAULT set_auth_url

+    _neutron_setup_interface_driver $NEUTRON_TEST_CONFIG_FILE

+

+    neutron_plugin_configure_debug_command

+}

+

+function _configure_neutron_dhcp_agent() {

+    AGENT_DHCP_BINARY="$NEUTRON_BIN_DIR/neutron-dhcp-agent"

+    Q_DHCP_CONF_FILE=$NEUTRON_CONF_DIR/dhcp_agent.ini

+

+    cp $NEUTRON_DIR/etc/dhcp_agent.ini $Q_DHCP_CONF_FILE

+

+    iniset $Q_DHCP_CONF_FILE DEFAULT verbose True

+    iniset $Q_DHCP_CONF_FILE DEFAULT debug True

+    iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE

+    iniset $Q_DHCP_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"

+

+    _neutron_setup_keystone $Q_DHCP_CONF_FILE DEFAULT set_auth_url

+    _neutron_setup_interface_driver $Q_DHCP_CONF_FILE

+

+    neutron_plugin_configure_dhcp_agent

+}

+

+function _configure_neutron_l3_agent() {

+    Q_L3_ENABLED=True

+    # for l3-agent, only use per tenant router if we have namespaces

+    Q_L3_ROUTER_PER_TENANT=$Q_USE_NAMESPACE

+    AGENT_L3_BINARY="$NEUTRON_BIN_DIR/neutron-l3-agent"

+    Q_L3_CONF_FILE=$NEUTRON_CONF_DIR/l3_agent.ini

+

+    cp $NEUTRON_DIR/etc/l3_agent.ini $Q_L3_CONF_FILE