Fix Neutron enabled check
* Remove the check for neutron enabled on a block of variable settings, there
is no conflict and serves no purpose.
* Also floating_ips.sh and volume.sh needed to properly source lib/neutron
for do ping_check() to work properly.
The current error in check-devstack-dsvm-neutron is not related to this fix.
Change-Id: I1c458aaa787ffb98c945aefc3afa80c6861a405f
diff --git a/exercises/floating_ips.sh b/exercises/floating_ips.sh
index b981aa8..8dc44ef 100755
--- a/exercises/floating_ips.sh
+++ b/exercises/floating_ips.sh
@@ -27,12 +27,12 @@
# Import common functions
source $TOP_DIR/functions
-# Import project functions
-source $TOP_DIR/lib/neutron
-
# Import configuration
source $TOP_DIR/openrc
+# Import project functions
+source $TOP_DIR/lib/neutron
+
# Import exercise configuration
source $TOP_DIR/exerciserc