Browse code
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
Brant Knudson authored on 2014/01/17 09:16:48Showing 3 changed files
| ... | ... |
@@ -305,9 +305,13 @@ rm -f $SSL_BUNDLE_FILE |
| 305 | 305 |
# Configure Projects |
| 306 | 306 |
# ================== |
| 307 | 307 |
|
| 308 |
-# Source project function libraries |
|
| 308 |
+# Import apache functions |
|
| 309 | 309 |
source $TOP_DIR/lib/apache |
| 310 |
+ |
|
| 311 |
+# Import TLS functions |
|
| 310 | 312 |
source $TOP_DIR/lib/tls |
| 313 |
+ |
|
| 314 |
+# Source project function libraries |
|
| 311 | 315 |
source $TOP_DIR/lib/infra |
| 312 | 316 |
source $TOP_DIR/lib/oslo |
| 313 | 317 |
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 |
|