From d8da7fb8bf0430d3b2c04259b99a034ac7b2d88d Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 3 Mar 2015 17:06:09 -0500
Subject: [PATCH] Fix missing settings and global-settings option for
 maven-target

With the upstream JJB patch merged we can finally fix this issue.
https://review.openstack.org/#/c/155865/

Change-Id: Ia0064b8fd141a21374a93ba9981834ba99bee60c
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/ovsdb/ovsdb-custom.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jjb/ovsdb/ovsdb-custom.yaml b/jjb/ovsdb/ovsdb-custom.yaml
index b8729bc2b..5d5d7c7ca 100644
--- a/jjb/ovsdb/ovsdb-custom.yaml
+++ b/jjb/ovsdb/ovsdb-custom.yaml
@@ -57,6 +57,8 @@
             properties:
                 - 'ovsdbserver.ipaddress=127.0.0.1'
                 - 'ovsdbserver.port=6641'
+            settings: '{ovsdb-settings}'
+            global-settings: '{odl-global-settings}'
         - inject:
             properties-file: env.properties
         - shell:
-- 
2.36.6