From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 25 Jan 2016 15:14:32 +0000 (+0000)
Subject: Merge "loadbalancer: add Gnocchi API support"
X-Git-Tag: opnfv-6.0.0~809
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9f88d7ad0a043f963e21c842e453af7811b52f34;p=apex-puppet-tripleo.git

Merge "loadbalancer: add Gnocchi API support"
---

9f88d7ad0a043f963e21c842e453af7811b52f34
diff --cc manifests/loadbalancer.pp
index dbfc570,ec38c5c..5308a01
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@@ -137,17 -133,13 +137,22 @@@
  # [*aodh_certificate*]
  #  Filename of an HAProxy-compatible certificate and key file
  #  When set, enables SSL on the Aodh public API endpoint using the specified file.
 +#
 +# [*sahara_certificate*]
 +#  Filename of an HAProxy-compatible certificate and key file
 +#  When set, enables SSL on the Sahara public API endpoint using the specified file.
 +#  Defaults to undef
 +#
 +# [*trove_certificate*]
 +#  Filename of an HAProxy-compatible certificate and key file
 +#  When set, enables SSL on the Trove public API endpoint using the specified file.
  #  Defaults to undef
  #
+ # [*gnocchi_certificate*]
+ #  Filename of an HAProxy-compatible certificate and key file
+ #  When set, enables SSL on the Gnocchi public API endpoint using the specified file.
+ #  Defaults to undef
+ #
  # [*swift_certificate*]
  #  Filename of an HAProxy-compatible certificate and key file
  #  When set, enables SSL on the Swift public API endpoint using the specified file.