From 8b9e2b3c6ca5221249b8aa7dc792e756ee92209a Mon Sep 17 00:00:00 2001
From: Michael Henkel <mhenkel@juniper.net>
Date: Fri, 16 Jun 2017 10:49:57 -0700
Subject: Contrail: Fix controlplane/dataplane network asignments & enable
 optional dpdk

This patch will move the Contrail roles communication towards
OpenStack APIs from the public/external network to the
internal_api network. I will also add the option to enable
dpdk for Contrail.

Change-Id: Ia835df656031cdf28de20f41ec6ab1c028dced23
Closes-Bug: 1698422
---
 manifests/network/contrail/heat.pp | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'manifests/network/contrail/heat.pp')

diff --git a/manifests/network/contrail/heat.pp b/manifests/network/contrail/heat.pp
index 4ef2a31..cc4b5ec 100644
--- a/manifests/network/contrail/heat.pp
+++ b/manifests/network/contrail/heat.pp
@@ -24,21 +24,31 @@
 #  String value.
 #  Defaults to hiera('contrail::admin_password')
 #
+# [*admin_tenant_name*]
+#  (optional) admin tenant name.
+#  String value.
+#  Defaults to hiera('contrail::admin_tenant_name')
+#
+# [*admin_token*]
+#  (optional) admin token
+#  String value.
+#  Defaults to hiera('contrail::admin_token')
+#
 # [*admin_user*]
 #  (optional) admin user name.
 #  String value.
 #  Defaults to hiera('contrail::admin_user')
 #
+# [*api_server*]
+#  (optional) IP address of api server
+#  String value.
+#  Defaults to hiera('contrail_config_vip',hiera('internal_api_virtual_ip'))
+#
 # [*api_port*]
 #  (optional) port of api server
 #  String value.
 #  Defaults to hiera('contrail::api_port')
 #
-# [*api_server*]
-#  (optional) IP address of api server
-#  String value.
-#  Defaults to hiera('contrail_config_vip')
-#
 # [*auth_host*]
 #  (optional) keystone server ip address
 #  String (IPv4) value.
@@ -56,14 +66,16 @@
 #
 class tripleo::network::contrail::heat(
   $admin_password = hiera('contrail::admin_password'),
+  $admin_token    = hiera('contrail::admin_token'),
   $admin_user     = hiera('contrail::admin_user'),
+  $api_server     = hiera('contrail_config_vip',hiera('internal_api_virtual_ip')),
   $api_port       = 8082,
-  $api_server     = hiera('contrail_config_vip'),
   $auth_host      = hiera('contrail::auth_host'),
   $step           = Integer(hiera('step')),
   $use_ssl        = 'False',
 )
 {
+
   class {'::contrail::heat':
     heat_config            => {
       'clients_contrail' => {
-- 
cgit 1.2.3-korg