From 31058e7887db616ca71f0479aba0781326de0ead Mon Sep 17 00:00:00 2001
From: Jaume Devesa <devvesa@gmail.com>
Date: Wed, 22 Jul 2015 12:17:17 +0200
Subject: [PATCH] Add `client_ip` at zookeeper config

Let the DevOps choose the IP from where to listen ZooKeeper client
requests.

Change-Id: I35c1ed56ea0ba417d9a50539760bc553026d27cd
---
 manifests/zookeeper.pp                 | 11 +++++++----
 spec/classes/midonet_zookeeper_spec.rb |  5 +++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/manifests/zookeeper.pp b/manifests/zookeeper.pp
index 753bf35..ee34d3f 100644
--- a/manifests/zookeeper.pp
+++ b/manifests/zookeeper.pp
@@ -8,6 +8,8 @@
 #   Full list of ZooKeeper servers that run in the same cluster.
 # [*server_id*]
 #   Identifier of this ZooKeeper server in the cluster.
+# [*client_ip*]
+#   IP address from where the ZooKeeper listen client requests
 #
 # === Examples
 #
@@ -90,11 +92,12 @@
 # limitations under the License.
 #
 
-class midonet::zookeeper($servers, $server_id) {
+class midonet::zookeeper($servers, $server_id, $client_ip=$::ipaddress_eth0) {
 
     class {'::zookeeper':
-      servers => zookeeper_servers($servers),
-      id      => $server_id,
-      cfg_dir => '/etc/zookeeper'
+      servers   => zookeeper_servers($servers),
+      id        => $server_id,
+      cfg_dir   => '/etc/zookeeper',
+      client_ip => $client_ip
     }
 }
diff --git a/spec/classes/midonet_zookeeper_spec.rb b/spec/classes/midonet_zookeeper_spec.rb
index 2370f25..73f8b76 100644
--- a/spec/classes/midonet_zookeeper_spec.rb
+++ b/spec/classes/midonet_zookeeper_spec.rb
@@ -22,8 +22,9 @@ describe 'midonet::zookeeper' do
 
     it 'should call deric/zookeeper properly' do
       is_expected.to contain_class('zookeeper').with({
-         'servers' => zookeeper_params[:servers],
-         'id'      =>  zookeeper_params[:id]
+         'servers'   => zookeeper_params[:servers],
+         'id'        => zookeeper_params[:id],
+         'client_ip' => '127.0.0.1'
       })
     end
   end