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

This commit is contained in:
Jenkins 2014-01-25 18:38:03 +00:00 committed by Gerrit Code Review
commit 3c89fbacc1
3 changed files with 22 additions and 9 deletions

View File

@ -28,8 +28,6 @@
XTRACE=$(set +o | grep xtrace)
set +o xtrace
source $TOP_DIR/lib/tls
# Defaults
# --------

View File

@ -312,9 +312,13 @@ rm -f $SSL_BUNDLE_FILE
# 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

View File

@ -30,20 +30,31 @@ if [[ $EUID -eq 0 ]]; then
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