From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Wed, 16 Nov 2016 06:34:08 +0000 (+0200)
Subject: Remove explicit hiera calls for heat in keystone profile
X-Git-Tag: opnfv-6.0.0~481
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3d31d62535290bf9fa17e9409aaf0d478c56fa6a;p=apex-puppet-tripleo.git

Remove explicit hiera calls for heat in keystone profile

These are now passed via the heat profiles in t-h-t (via
heat-base.yaml and heat-engine.yaml) and use the actual names of
keystone parameters instead.

Change-Id: Id0f5dd03b6757df989339c93b58a5b7eac3402a2
Depends-On: I0e5124d57fdc519262fdec2dbeaaac85afaeebdf
---

diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 9801eb2..699e3c0 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -76,20 +76,19 @@
 #
 # [*heat_admin_domain*]
 #   domain name for heat admin
-#   Defaults to hiera('heat::keystone::domain::domain_name', 'heat')
+#   Defaults to undef
 #
 # [*heat_admin_user*]
 #   heat admin user name
-#   Defaults to hiera('heat::keystone::domain::domain_admin', 'heat_admin')
+#   Defaults to undef
 #
 # [*heat_admin_email*]
 #   heat admin email address
-#   Defaults to hiera('heat::keystone::domain::domain_admin_email',
-#     'heat_admin@localhost')
+#   Defaults to undef
 #
 # [*heat_admin_password*]
 #   heat admin password
-#   Defaults to hiera('heat::keystone::domain::domain_password')
+#   Defaults to undef
 #
 class tripleo::profile::base::keystone (
   $admin_endpoint_network        = hiera('keystone_admin_api_network', undef),
@@ -102,10 +101,10 @@ class tripleo::profile::base::keystone (
   $rabbit_hosts                  = hiera('rabbitmq_node_ips', undef),
   $rabbit_port                   = hiera('keystone::rabbit_port', 5672),
   $step                          = hiera('step'),
-  $heat_admin_domain             = hiera('heat::keystone::domain::domain_name', 'heat'),
-  $heat_admin_user               = hiera('heat::keystone::domain::domain_admin', 'heat_admin'),
-  $heat_admin_email              = hiera('heat::keystone::domain::domain_admin_email', 'heat_admin@localhost'),
-  $heat_admin_password           = hiera('heat::keystone::domain::domain_password'),
+  $heat_admin_domain             = undef,
+  $heat_admin_user               = undef,
+  $heat_admin_email              = undef,
+  $heat_admin_password           = undef,
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true