From f6a54c6a1dc497a7648593ae63f894185d092797 Mon Sep 17 00:00:00 2001
From: Alex Ruiz Estradera <ahharu@ahharu.com>
Date: Tue, 31 Jan 2017 11:45:24 +0100
Subject: [PATCH] Add configurable parameters for midonet state proxy

Change-Id: I863a815dea3ad543b571ed10991ca61ac4b9a442
---
 manifests/cluster.pp                       | 10 ++++++++++
 manifests/cluster/run.pp                   | 10 +++++++++-
 templates/cluster/mn-cluster_config.sh.erb |  4 ++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/manifests/cluster.pp b/manifests/cluster.pp
index d88e18c..74ba7b2 100644
--- a/manifests/cluster.pp
+++ b/manifests/cluster.pp
@@ -114,6 +114,12 @@
 # [*jarvis_enabled*]
 #   Should enable jarvis?
 #     Default: 'undef'
+# [*state_proxy_address*]
+#   Address to bind to the state proxy service
+#     Default: undef
+# [*state_proxy_port*]
+#   Address to bind to the state proxy service
+#     Default: undef
 #
 # === Examples
 #
@@ -199,6 +205,8 @@ class midonet::cluster (
   $ssl_keystore_pwd          = undef,
   $flow_history_port         = undef,
   $jarvis_enabled            = undef,
+  $state_proxy_address       = undef,
+  $state_proxy_port          = undef
 ) {
 
     class { 'midonet::cluster::install':
@@ -251,6 +259,8 @@ class midonet::cluster (
       ssl_keystore_pwd          => $ssl_keystore_pwd,
       flow_history_port         => $flow_history_port,
       jarvis_enabled            => $jarvis_enabled,
+      state_proxy_address       => $state_proxy_address,
+      state_proxy_port          => $state_proxy_port,
       require                   => Class['midonet::cluster::install']
     }
     contain midonet::cluster::run
diff --git a/manifests/cluster/run.pp b/manifests/cluster/run.pp
index e9acff2..890ac6a 100644
--- a/manifests/cluster/run.pp
+++ b/manifests/cluster/run.pp
@@ -112,6 +112,12 @@
 # [*midonet_version*]
 #   Midoent Version
 #     Default: '5.2'
+# [*state_proxy_address*]
+#   Address to bind to the state proxy service
+#     Default: undef
+# [*state_proxy_port*]
+#   Address to bind to the state proxy service
+#     Default: undef
 # === Authors
 #
 # Midonet (http://midonet.org)
@@ -180,7 +186,9 @@ class midonet::cluster::run (
   $ssl_keystore_pwd                = undef,
   $flow_history_port               = '5001',
   $jarvis_enabled                  = true,
-  $midonet_version                 = '5.2'
+  $midonet_version                 = '5.2',
+  $state_proxy_address             = '0.0.0.0',
+  $state_proxy_port                = '2346'
 ) {
 
   include ::stdlib
diff --git a/templates/cluster/mn-cluster_config.sh.erb b/templates/cluster/mn-cluster_config.sh.erb
index 7a6009e..0b71231 100644
--- a/templates/cluster/mn-cluster_config.sh.erb
+++ b/templates/cluster/mn-cluster_config.sh.erb
@@ -56,6 +56,10 @@ cluster.rest_api {
   http_host = <%= @cluster_host %>
   http_port = <%= @cluster_port %>
 }
+cluster.state_proxy.server {
+  address = <%= @state_proxy_address %>
+  port = <%= @state_proxy_port %>
+}
 EOF
 
 exit 0