Make unstack.sh more like stack.sh
unstack.sh and stack.sh both have to "configure projects", but the
code was different. This change makes it so the 2 sections of the
files are the same.
Change-Id: Ia06f8bbfbe2a6e87fb406e34e13a39bd7fa9e5af
diff --git a/lib/keystone b/lib/keystone
index ceefe6a..71ac668 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -28,8 +28,6 @@
XTRACE=$(set +o | grep xtrace)
set +o xtrace
-source $TOP_DIR/lib/tls
-
# Defaults
# --------
diff --git a/stack.sh b/stack.sh
index 7da41a9..50a4cd2 100755
--- a/stack.sh
+++ b/stack.sh
@@ -305,9 +305,13 @@
# Configure Projects
# ==================
-# Source project function libraries
+# Import apache functions
source $TOP_DIR/lib/apache
+
+# Import TLS functions
source $TOP_DIR/lib/tls
+
+# Source project function libraries
source $TOP_DIR/lib/infra
source $TOP_DIR/lib/oslo
source $TOP_DIR/lib/stackforge
diff --git a/unstack.sh b/unstack.sh
index 4445f1f..31f6f01 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -30,20 +30,31 @@
exit 1
fi
+
+# Configure Projects
+# ==================
+
# Import apache functions
source $TOP_DIR/lib/apache
-# Get project function libraries
-source $TOP_DIR/lib/baremetal
-source $TOP_DIR/lib/ceilometer
-source $TOP_DIR/lib/cinder
+# Import TLS functions
+source $TOP_DIR/lib/tls
+
+# Source project function libraries
+source $TOP_DIR/lib/infra
+source $TOP_DIR/lib/oslo
+source $TOP_DIR/lib/stackforge
+source $TOP_DIR/lib/horizon
source $TOP_DIR/lib/keystone
source $TOP_DIR/lib/glance
source $TOP_DIR/lib/nova
-source $TOP_DIR/lib/heat
-source $TOP_DIR/lib/horizon
+source $TOP_DIR/lib/cinder
source $TOP_DIR/lib/swift
+source $TOP_DIR/lib/ceilometer
+source $TOP_DIR/lib/heat
source $TOP_DIR/lib/neutron
+source $TOP_DIR/lib/baremetal
+source $TOP_DIR/lib/ldap
source $TOP_DIR/lib/ironic
source $TOP_DIR/lib/trove