From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Wed, 18 Jan 2017 22:26:55 +0000 (+0200)
Subject: Use network entries for nova placement
X-Git-Tag: opnfv-6.0.0~404
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=53ee464a37b2644998a9d360d99a760139884232;p=apex-puppet-tripleo.git

Use network entries for nova placement

Having these available from t-h-t, we should be able to use these now.

Change-Id: I7272df25c4fdba152fe15d40444311bc35ace4d9
Depends-On: Id0d34c7c3939ee81126ffd26d0658c0a87805a44
---

diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index cc21e37..4c041c1 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -380,6 +380,10 @@
 #  (optional) Specify the network nova_osapi is running on.
 #  Defaults to hiera('nova_api_network', undef)
 #
+# [*nova_placement_network*]
+#  (optional) Specify the network nova_placement is running on.
+#  Defaults to hiera('nova_placement_network', undef)
+#
 # [*opendaylight_network*]
 #  (optional) Specify the network opendaylight is running on.
 #  Defaults to hiera('opendaylight_api_network', undef)
@@ -558,6 +562,7 @@ class tripleo::haproxy (
   $nova_metadata_network       = hiera('nova_api_network', undef),
   $nova_novncproxy_network     = hiera('nova_vnc_proxy_network', undef),
   $nova_osapi_network          = hiera('nova_api_network', undef),
+  $nova_placement_network      = hiera('nova_placement_network', undef),
   $panko_network               = hiera('panko_api_network', undef),
   $ovn_dbs_network             = hiera('ovn_dbs_network', undef),
   $sahara_network              = hiera('sahara_api_network', undef),
@@ -952,7 +957,7 @@ class tripleo::haproxy (
             'set-header X-Forwarded-Proto http if !{ ssl_fc }'],
       },
       public_ssl_port   => $ports[nova_placement_ssl_port],
-      service_network   => $nova_osapi_network,
+      service_network   => $nova_placement_network,
       member_options    => union($haproxy_member_options, $internal_tls_member_options),
     }
   }