Browse code

Merge "Make unstack.sh more like stack.sh"

Jenkins authored on 2014/01/26 03:38:03
Showing 3 changed files
... ...
@@ -28,8 +28,6 @@
28 28
 XTRACE=$(set +o | grep xtrace)
29 29
 set +o xtrace
30 30
 
31
-source $TOP_DIR/lib/tls
32
-
33 31
 # Defaults
34 32
 # --------
35 33
 
... ...
@@ -312,9 +312,13 @@ rm -f $SSL_BUNDLE_FILE
312 312
 # Configure Projects
313 313
 # ==================
314 314
 
315
-# Source project function libraries
315
+# Import apache functions
316 316
 source $TOP_DIR/lib/apache
317
+
318
+# Import TLS functions
317 319
 source $TOP_DIR/lib/tls
320
+
321
+# Source project function libraries
318 322
 source $TOP_DIR/lib/infra
319 323
 source $TOP_DIR/lib/oslo
320 324
 source $TOP_DIR/lib/stackforge
... ...
@@ -30,20 +30,31 @@ if [[ $EUID -eq 0 ]]; then
30 30
     exit 1
31 31
 fi
32 32
 
33
+
34
+# Configure Projects
35
+# ==================
36
+
33 37
 # Import apache functions
34 38
 source $TOP_DIR/lib/apache
35 39
 
36
-# Get project function libraries
37
-source $TOP_DIR/lib/baremetal
38
-source $TOP_DIR/lib/ceilometer
39
-source $TOP_DIR/lib/cinder
40
+# Import TLS functions
41
+source $TOP_DIR/lib/tls
42
+
43
+# Source project function libraries
44
+source $TOP_DIR/lib/infra
45
+source $TOP_DIR/lib/oslo
46
+source $TOP_DIR/lib/stackforge
47
+source $TOP_DIR/lib/horizon
40 48
 source $TOP_DIR/lib/keystone
41 49
 source $TOP_DIR/lib/glance
42 50
 source $TOP_DIR/lib/nova
43
-source $TOP_DIR/lib/heat
44
-source $TOP_DIR/lib/horizon
51
+source $TOP_DIR/lib/cinder
45 52
 source $TOP_DIR/lib/swift
53
+source $TOP_DIR/lib/ceilometer
54
+source $TOP_DIR/lib/heat
46 55
 source $TOP_DIR/lib/neutron
56
+source $TOP_DIR/lib/baremetal
57
+source $TOP_DIR/lib/ldap
47 58
 source $TOP_DIR/lib/ironic
48 59
 source $TOP_DIR/lib/trove
49 60