From 8fa561f8f028a73f704062fbeca3cdaaf1b7027e Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 31 Jan 2019 14:38:25 +0200
Subject: [PATCH] Remove default post-save command from mysql

That was not being used. The new certificate will be picked up when
mysql is restarted (which would happen on an upgrade).

Change-Id: If4ca3e9f0c248ae6df6c57edc9a2adf841d2e425
Related-Bug: #1811401
---
 manifests/certmonger/mysql.pp                 | 17 +----------------
 spec/classes/tripleo_certmonger_mysql_spec.rb |  6 ------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/manifests/certmonger/mysql.pp b/manifests/certmonger/mysql.pp
index ae408b679..cadcf455b 100644
--- a/manifests/certmonger/mysql.pp
+++ b/manifests/certmonger/mysql.pp
@@ -56,9 +56,7 @@ class tripleo::certmonger::mysql (
   $principal     = undef,
 ) {
   include ::certmonger
-  include ::mysql::params
 
-  $postsave_cmd_real = pick($postsave_cmd, "systemctl reload ${::mysql::params::server_service_name}")
   certmonger_certificate { 'mysql' :
     ensure       => 'present',
     certfile     => $service_certificate,
@@ -66,22 +64,9 @@ class tripleo::certmonger::mysql (
     hostname     => $hostname,
     dnsname      => $dnsnames,
     principal    => $principal,
-    postsave_cmd => $postsave_cmd_real,
+    postsave_cmd => $postsave_cmd,
     ca           => $certmonger_ca,
     wait         => true,
     require      => Class['::certmonger'],
   }
-  file { $service_certificate :
-    owner   => 'mysql',
-    group   => 'mysql',
-    require => Certmonger_certificate['mysql'],
-  }
-  file { $service_key :
-    owner   => 'mysql',
-    group   => 'mysql',
-    require => Certmonger_certificate['mysql'],
-  }
-
-  File[$service_certificate] ~> Service<| title == $::mysql::params::server_service_name |>
-  File[$service_key] ~> Service<| title == $::mysql::params::server_service_name |>
 }
diff --git a/spec/classes/tripleo_certmonger_mysql_spec.rb b/spec/classes/tripleo_certmonger_mysql_spec.rb
index 23b1e4f4c..27ef2592d 100644
--- a/spec/classes/tripleo_certmonger_mysql_spec.rb
+++ b/spec/classes/tripleo_certmonger_mysql_spec.rb
@@ -33,10 +33,6 @@ describe 'tripleo::certmonger::mysql' do
       is_expected.to contain_class('certmonger')
     end
 
-    it 'should include the mysql parameters' do
-      is_expected.to contain_class('mysql::params')
-    end
-
     it 'should request a certificate' do
       is_expected.to contain_certmonger_certificate('mysql').with(
         :ensure       => 'present',
@@ -47,8 +43,6 @@ describe 'tripleo::certmonger::mysql' do
         :ca           => 'local',
         :wait         => true,
       )
-      is_expected.to contain_file('/etc/pki/cert.crt')
-      is_expected.to contain_file('/etc/pki/key.pem')
     end
   end