Volans has uploaded a new change for review.
https://gerrit.wikimedia.org/r/280234
Change subject: Resolve conflict on /etc/mysql/ssl directory
......................................................................
Resolve conflict on /etc/mysql/ssl directory
- The directory is also managed by expose_puppet_certs, removing it from
here to avoid the conflict
- Moved the expose_puppet_certs on top to make explicit it's dependency
- Removed unnecessary requires, Puppet does autorequire if the parent
directory of a file is managed by Puppet
Bug: T111654
Change-Id: Ic0a7a3ac1192858de4e6f0ce18db3ddf0310f218
---
M manifests/config.pp
1 file changed, 7 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/mariadb
refs/changes/34/280234/1
diff --git a/manifests/config.pp b/manifests/config.pp
index 9aa89f2..9c829d7 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -85,13 +85,14 @@
if ($ssl == 'on' or $ssl == 'multiple-ca') {
- file { '/etc/mysql/ssl':
- ensure => directory,
- owner => 'root',
- group => 'mysql',
- mode => '0750',
- require => File['/etc/mysql']
+ # This creates also /etc/mysql/ssl
+ ::base::expose_puppet_certs { '/etc/mysql':
+ ensure => present,
+ provide_private => true,
+ user => 'mysql',
+ group => 'mysql',
}
+
file { '/etc/mysql/ssl/cacert.pem':
ensure => file,
owner => 'root',
@@ -100,7 +101,6 @@
show_diff => false,
backup => false,
content => secret('mysql/cacert.pem'),
- require => File['/etc/mysql/ssl'],
}
file { '/etc/mysql/ssl/server-key.pem':
ensure => file,
@@ -110,7 +110,6 @@
show_diff => false,
backup => false,
content => secret('mysql/server-key.pem'),
- require => File['/etc/mysql/ssl'],
}
file { '/etc/mysql/ssl/server-cert.pem':
ensure => file,
@@ -120,7 +119,6 @@
show_diff => false,
backup => false,
content => secret('mysql/server-cert.pem'),
- require => File['/etc/mysql/ssl'],
}
file { '/etc/mysql/ssl/client-key.pem':
ensure => file,
@@ -130,7 +128,6 @@
show_diff => false,
backup => false,
content => secret('mysql/client-key.pem'),
- require => File['/etc/mysql/ssl'],
}
file { '/etc/mysql/ssl/client-cert.pem':
ensure => file,
@@ -140,15 +137,8 @@
show_diff => false,
backup => false,
content => secret('mysql/client-cert.pem'),
- require => File['/etc/mysql/ssl'],
}
- ::base::expose_puppet_certs { '/etc/mysql':
- ensure => present,
- provide_private => true,
- user => 'mysql',
- group => 'mysql',
- }
}
if ($ssl == 'multiple-ca') {
--
To view, visit https://gerrit.wikimedia.org/r/280234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0a7a3ac1192858de4e6f0ce18db3ddf0310f218
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/mariadb
Gerrit-Branch: master
Gerrit-Owner: Volans <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
