@@ -623,6 +623,13 @@ function init_neutron {

 # install_neutron() - Collect source and prepare

 function install_neutron {

+    # Install neutron-lib from git so we make sure we're testing

+    # the latest code.

+    if use_library_from_git "neutron-lib"; then

+        git_clone_by_name "neutron-lib"

+        setup_dev_lib "neutron-lib"

+    fi

+

     git_clone $NEUTRON_REPO $NEUTRON_DIR $NEUTRON_BRANCH

     setup_develop $NEUTRON_DIR

     if is_service_enabled q-fwaas; then

@@ -488,6 +488,11 @@ GITREPO["diskimage-builder"]=${DIB_REPO:-${GIT_BASE}/openstack/diskimage-builder

 GITBRANCH["diskimage-builder"]=${DIB_BRANCH:-master}

 GITDIR["diskimage-builder"]=$DEST/diskimage-builder

+# neutron-lib library containing neutron stable non-REST interfaces

+GITREPO["neutron-lib"]=${NEUTRON_LIB_REPO:-${GIT_BASE}/openstack/neutron-lib.git}

+GITBRANCH["neutron-lib"]=${NEUTRON_LIB_BRANCH:-master}

+GITDIR["neutron-lib"]=$DEST/neutron-lib

+

 ##################

 #

 #  TripleO / Heat Agent Components

@@ -41,7 +41,7 @@ ALL_LIBS+=" oslo.utils python-swiftclient"

 ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"

 ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"

 ALL_LIBS+=" oslo.cache oslo.reports osprofiler"

-ALL_LIBS+=" keystoneauth ironic-lib oslo.privsep"

+ALL_LIBS+=" keystoneauth ironic-lib neutron-lib oslo.privsep"

 ALL_LIBS+=" diskimage-builder"

 # Generate the above list with