From 0e0d0621130eb24e193b1a334848774923828d7b Mon Sep 17 00:00:00 2001
From: chadlung <chad.lung@gmail.com>
Date: Wed, 26 Feb 2014 11:29:29 -0600
Subject: [PATCH] Adjust contrib location, minor adjustments

Change-Id: I0a962f487ac3362b209422554286e76441daa06a
---
 .coveragerc                                                    | 2 +-
 {barbican/contrib => contrib}/devstack/extras.d/70-barbican.sh | 2 +-
 {barbican/contrib => contrib}/devstack/lib/barbican            | 0
 functionaltests/pre_test_hook.sh                               | 2 +-
 tox.ini                                                        | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {barbican/contrib => contrib}/devstack/extras.d/70-barbican.sh (99%)
 rename {barbican/contrib => contrib}/devstack/lib/barbican (100%)

diff --git a/.coveragerc b/.coveragerc
index f7d3307ab..5e6e6b0a9 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,6 +1,6 @@
 [run]
 branch = True
-omit = etc/*,setup.py,*egg*,.tox/*,barbican/tests/*,*barbican/openstack/*,*barbican/functionaltests/*,*barbican/contrib/*
+omit = etc/*,setup.py,*egg*,.tox/*,barbican/tests/*,*barbican/openstack/*,functionaltests/*,contrib/*
 
 [report]
 ignore_errors = True
diff --git a/barbican/contrib/devstack/extras.d/70-barbican.sh b/contrib/devstack/extras.d/70-barbican.sh
similarity index 99%
rename from barbican/contrib/devstack/extras.d/70-barbican.sh
rename to contrib/devstack/extras.d/70-barbican.sh
index e0d531835..4e4f45b5d 100755
--- a/barbican/contrib/devstack/extras.d/70-barbican.sh
+++ b/contrib/devstack/extras.d/70-barbican.sh
@@ -7,8 +7,8 @@ if is_service_enabled barbican; then
         source $TOP_DIR/lib/barbican
     elif [[ "$1" == "stack" && "$2" == "install" ]]; then
         echo_summary "Installing Barbican"
-        install_barbicanclient
         install_barbican
+        install_barbicanclient
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         echo_summary "Configuring Barbican"
         configure_barbican
diff --git a/barbican/contrib/devstack/lib/barbican b/contrib/devstack/lib/barbican
similarity index 100%
rename from barbican/contrib/devstack/lib/barbican
rename to contrib/devstack/lib/barbican
diff --git a/functionaltests/pre_test_hook.sh b/functionaltests/pre_test_hook.sh
index 8f31d8b0a..2cc432640 100755
--- a/functionaltests/pre_test_hook.sh
+++ b/functionaltests/pre_test_hook.sh
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# This script is executed inside pre_test_hook function in desvstack gate.
+# This script is executed inside pre_test_hook function in devstack gate.
 
 # Install barbican devstack integration
 BARBICAN_BASE=/opt/stack/new/barbican/contrib/devstack
diff --git a/tox.ini b/tox.ini
index 26df856f1..637aea171 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,4 +24,4 @@ commands = {toxinidir}/tools/hacking.sh {posargs}
 # E711 ignored because of sqlalchemy override of == None
 # H ignored because it's not H clean
 ignore = E711,H
-exclude = .git,.idea,.tox,bin,dist,debian,rpmbuild,tools,*.egg-info,*openstack/common
+exclude = .git,.idea,.tox,bin,dist,debian,rpmbuild,tools,*.egg-info,*openstack/common,contrib,functionaltests