summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordukhlov <dukhlov@mirantis.com>2016-02-02 05:30:18 -0500
committerDmitriy Ukhlov <dukhlov@mirantis.com>2016-02-02 13:19:32 +0000
commita3a28940890a5dcc0f0eb36ce2f8515a4154bbfd (patch)
tree6a66771ab4cc355037e3fdb44a9212a3c2ea1b00
parent1e643aaad77a2dd79e4a4d1cf349a78ff715b9bb (diff)
Add get_transport_url function patching
Notes
Notes (review): Code-Review+2: Dmitriy Ukhlov <dukhlov@mirantis.com> Workflow+1: Dmitriy Ukhlov <dukhlov@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 02 Feb 2016 13:57:24 +0000 Reviewed-on: https://review.openstack.org/275109 Project: openstack/devstack-plugin-pika Branch: refs/heads/master
-rw-r--r--.gitreview4
-rw-r--r--devstack/plugin.sh8
-rw-r--r--tox.ini25
3 files changed, 35 insertions, 2 deletions
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..bbcdf05
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
1[gerrit]
2host=review.openstack.org
3port=29418
4project=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 @@
14# License for the specific language governing permissions and limitations 14# License for the specific language governing permissions and limitations
15# under the License. 15# under the License.
16 16
17function get_transport_url {
18 echo "pika://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672"
19}
20
17function iniset_rpc_backend { 21function iniset_rpc_backend {
18 local package=$1 22 local package=$1
19 local file=$2 23 local file=$2
20 local section=${3:-DEFAULT} 24 local section=${3:-DEFAULT}
21 25
22 iniset $file $section transport_url "pika://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672" 26 iniset $file $section transport_url $(get_transport_url)
23} \ No newline at end of file 27}
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..8e75f0d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,25 @@
1[tox]
2minversion = 1.6
3skipsdist = True
4envlist = bashate
5
6[testenv]
7usedevelop = False
8install_command = pip install {opts} {packages}
9
10[testenv:bashate]
11deps = bashate
12whitelist_externals = bash
13commands = bash -c "find {toxinidir} \
14 -not \( -type d -name .?\* -prune \) \
15 -not \( -type d -name doc -prune \) \
16 -type f \
17 -not -name \*~ \
18 -not -name \*.md \
19 \( \
20 -name \*.sh -or \
21 -name \*rc -or \
22 -name functions\* -or \
23 -wholename \*/lib/\* \
24 \) \
25 -print0 | xargs -0 bashate -v"