Jcrespo has submitted this change and it was merged.

Change subject: Fixing import issue for ssl_key (minor syntax change)
......................................................................


Fixing import issue for ssl_key (minor syntax change)

Change-Id: I6fba419c1f2a7e31a6a4252eaf8f12813f0a22a6
References: T111654
---
M manifests/config.pp
1 file changed, 5 insertions(+), 6 deletions(-)

Approvals:
  Jcrespo: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/config.pp b/manifests/config.pp
index e028fac..bef17ae 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -83,7 +83,6 @@
     }
 
     if ($ssl == 'on') {
-        include mariadb::ssl_key
 
         file { '/etc/mysql/ssl':
             ensure  => directory,
@@ -92,19 +91,19 @@
             mode    => '0750',
             require => File['/etc/mysql']
         }
-        ssl_key { 'cacert':
+        mariadb::ssl_key { 'cacert':
             file => 'cacert.pem',
         }
-        ssl_key { 'server-key':
+        mariadb::ssl_key { 'server-key':
             file => 'server-key.pem',
         }
-        ssl_key { 'server-cert':
+        mariadb::ssl_key { 'server-cert':
             file => 'server-cert.pem',
         }
-        ssl_key { 'client-key':
+        mariadb::ssl_key { 'client-key':
             file => 'client-key.pem',
         }
-        ssl_key { 'client-cert':
+        mariadb::ssl_key { 'client-cert':
             file => 'client-cert.pem',
         }
     }

-- 
To view, visit https://gerrit.wikimedia.org/r/256451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6fba419c1f2a7e31a6a4252eaf8f12813f0a22a6
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet/mariadb
Gerrit-Branch: master
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to