summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-08-26 00:00:00 +0000
committerGerrit Code Review <review@openstack.org>2014-08-26 00:00:00 +0000
commitd91dd6f400b4424abd792d514eb19090642150a9 (patch)
tree2bb98cfe3cfd94e20302c5193baf481d083f3cc6
parente6721122d563b81a63a302beedb89cd8ce21b1cc (diff)
parent9abaf883d459aeb6345eddb49777e7bdfc475f2e (diff)
Merge "command not found errors on unstack" into stable/havanahavana-eol
-rwxr-xr-xlib/keystone1
-rwxr-xr-xunstack.sh2
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/keystone b/lib/keystone
index b6b2d05..3489bd8 100755
--- a/lib/keystone
+++ b/lib/keystone
@@ -26,6 +26,7 @@
26XTRACE=$(set +o | grep xtrace) 26XTRACE=$(set +o | grep xtrace)
27set +o xtrace 27set +o xtrace
28 28
29source $TOP_DIR/lib/tls
29 30
30# Defaults 31# Defaults
31# -------- 32# --------
diff --git a/unstack.sh b/unstack.sh
index 77dbe07..4445f1f 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -35,10 +35,12 @@ source $TOP_DIR/lib/apache
35 35
36# Get project function libraries 36# Get project function libraries
37source $TOP_DIR/lib/baremetal 37source $TOP_DIR/lib/baremetal
38source $TOP_DIR/lib/ceilometer
38source $TOP_DIR/lib/cinder 39source $TOP_DIR/lib/cinder
39source $TOP_DIR/lib/keystone 40source $TOP_DIR/lib/keystone
40source $TOP_DIR/lib/glance 41source $TOP_DIR/lib/glance
41source $TOP_DIR/lib/nova 42source $TOP_DIR/lib/nova
43source $TOP_DIR/lib/heat
42source $TOP_DIR/lib/horizon 44source $TOP_DIR/lib/horizon
43source $TOP_DIR/lib/swift 45source $TOP_DIR/lib/swift
44source $TOP_DIR/lib/neutron 46source $TOP_DIR/lib/neutron