From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Fri, 9 Dec 2016 13:43:40 +0000 (+0200)
Subject: Remove unused variable in certmonger/mysql manifest
X-Git-Tag: opnfv-6.0.0~401^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cf63869b1c7084c2d74ecd47812e8f5c7e26b52b;p=apex-puppet-tripleo.git

Remove unused variable in certmonger/mysql manifest

This was initially meant to select the CN/SubjectAltName based on the
network, but this is now instead done in t-h-t. So this ended up being
unused.

Depends-On: Id5dfb38852cf2420f4195a3c1cb98d5c47bbd45e
Change-Id: I58c3aee0506469125a7837a27271c2fe18e1dd60
---

diff --git a/manifests/certmonger/mysql.pp b/manifests/certmonger/mysql.pp
index 62aff9a..9cb6b13 100644
--- a/manifests/certmonger/mysql.pp
+++ b/manifests/certmonger/mysql.pp
@@ -31,11 +31,6 @@
 #   (Optional) The CA that certmonger will use to generate the certificates.
 #   Defaults to hiera('certmonger_ca', 'local').
 #
-# [*mysql_network*]
-#   (Optional) The network name where the mysql endpoint is listening on.
-#   This is set by t-h-t.
-#   Defaults to hiera('mysql_network', undef)
-#
 # [*principal*]
 #   (Optional) The haproxy service principal that is set for MySQL in kerberos.
 #   Defaults to undef
@@ -45,16 +40,11 @@ class tripleo::certmonger::mysql (
   $service_certificate,
   $service_key,
   $certmonger_ca = hiera('certmonger_ca', 'local'),
-  $mysql_network = hiera('mysql_network', undef),
   $principal     = undef,
 ) {
   include ::certmonger
   include ::mysql::params
 
-  if !$mysql_network {
-    fail('mysql_network is not set in the hieradata.')
-  }
-
   $postsave_cmd        = "systemctl reload ${::mysql::params::service_name}"
   certmonger_certificate { 'mysql' :
     ensure       => 'present',