diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..bbcdf05
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/devstack-plugin-pika.git
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 7a83fce..4d1fd59 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -14,10 +14,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+function get_transport_url {
+    echo "pika://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672"
+}
+
 function iniset_rpc_backend {
     local package=$1
     local file=$2
     local section=${3:-DEFAULT}
 
-    iniset $file $section transport_url "pika://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672"
-}
\ No newline at end of file
+    iniset $file $section transport_url $(get_transport_url)
+}
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..8e75f0d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,25 @@
+[tox]
+minversion = 1.6
+skipsdist = True
+envlist = bashate
+
+[testenv]
+usedevelop = False
+install_command = pip install {opts} {packages}
+
+[testenv:bashate]
+deps = bashate
+whitelist_externals = bash
+commands = bash -c "find {toxinidir}          \
+         -not \( -type d -name .?\* -prune \) \
+         -not \( -type d -name doc -prune \)  \
+         -type f                              \
+         -not -name \*~                       \
+         -not -name \*.md                     \
+         \(                                   \
+          -name \*.sh -or                     \
+          -name \*rc -or                      \
+          -name functions\* -or               \
+          -wholename \*/lib/\*                \
+         \)                                   \
+         -print0 | xargs -0 bashate -v"