From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 4 Jan 2017 19:13:01 +0000 (+0000)
Subject: Merge "Fixes missing haproxy firewall rules for OpenDaylight"
X-Git-Tag: opnfv-6.0.0~427
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8cbf9c8504f269a1ba1662b81ca360de17d3a6c8;p=apex-puppet-tripleo.git

Merge "Fixes missing haproxy firewall rules for OpenDaylight"
---

8cbf9c8504f269a1ba1662b81ca360de17d3a6c8
diff --cc manifests/haproxy.pp
index c57666d,57d2d8f..1e76733
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@@ -447,10 -439,9 +447,11 @@@
  #    'nova_metadata_port' (Defaults to 8775)
  #    'nova_novnc_port' (Defaults to 6080)
  #    'nova_novnc_ssl_port' (Defaults to 13080)
+ #    'opendaylight_api_port' (Defaults to 8081)
  #    'panko_api_port' (Defaults to 8779)
  #    'panko_api_ssl_port' (Defaults to 13779)
 +#    'ovn_nbdb_port' (Defaults to 6641)
 +#    'ovn_sbdb_port' (Defaults to 6642)
  #    'sahara_api_port' (Defaults to 8386)
  #    'sahara_api_ssl_port' (Defaults to 13386)
  #    'swift_proxy_port' (Defaults to 8080)
@@@ -600,10 -589,9 +601,11 @@@ class tripleo::haproxy 
      nova_metadata_port => 8775,
      nova_novnc_port => 6080,
      nova_novnc_ssl_port => 13080,
+     opendaylight_api_port => 8081,
      panko_api_port => 8779,
      panko_api_ssl_port => 13779,
 +    ovn_nbdb_port => 6641,
 +    ovn_sbdb_port => 6642,
      sahara_api_port => 8386,
      sahara_api_ssl_port => 13386,
      swift_proxy_port => 8080,