Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/352636 )
Change subject: openstack: use logrotate::conf for logrotate
......................................................................
openstack: use logrotate::conf for logrotate
Change-Id: I71776e0ccf7e2549d01292f4609e811ec2862dd5
---
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/keystone/service.pp
2 files changed, 12 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/352636/1
diff --git a/modules/openstack/manifests/designate/service.pp
b/modules/openstack/manifests/designate/service.pp
index ff000b9..a27f117 100644
--- a/modules/openstack/manifests/designate/service.pp
+++ b/modules/openstack/manifests/designate/service.pp
@@ -93,19 +93,13 @@
# These would be automatically included in a correct designate package...
# probably this can be ripped out in Liberty.
- file { '/etc/logrotate.d/designate-mdns':
+ logrotate::conf { 'designate-mdns':
ensure => present,
source => 'puppet:///modules/openstack/designate-mdns.logrotate',
- owner => 'root',
- group => 'root',
- mode => '0444',
}
- file { '/etc/logrotate.d/designate-pool-manager':
+ logrotate::conf { 'designate-pool-manager':
ensure => present,
source =>
'puppet:///modules/openstack/designate-pool-manager.logrotate',
- owner => 'root',
- group => 'root',
- mode => '0444',
}
file { '/var/lib/designate/.ssh/':
diff --git a/modules/openstack/manifests/keystone/service.pp
b/modules/openstack/manifests/keystone/service.pp
index 699eb14..c53e368 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -78,18 +78,16 @@
mode => '0644',
notify => Service['uwsgi-keystone-admin',
'uwsgi-keystone-public'],
recurse => true;
- '/etc/logrotate.d/keystone-public-uwsgi':
- ensure => present,
- source =>
'puppet:///modules/openstack/keystone-public-uwsgi.logrotate',
- owner => 'root',
- group => 'root',
- mode => '0444';
- '/etc/logrotate.d/keystone-admin-uwsgi':
- ensure => present,
- source =>
'puppet:///modules/openstack/keystone-admin-uwsgi.logrotate',
- owner => 'root',
- group => 'root',
- mode => '0444';
+ }
+
+ logrotate::conf { 'keystone-public-uwsgi':
+ ensure => present,
+ source =>
'puppet:///modules/openstack/keystone-public-uwsgi.logrotate',
+ }
+
+ logrotate::conf { 'keystone-admin-uwsgi':
+ ensure => present,
+ source => 'puppet:///modules/openstack/keystone-admin-uwsgi.logrotate',
}
if $::fqdn == hiera('labs_nova_controller') {
--
To view, visit https://gerrit.wikimedia.org/r/352636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71776e0ccf7e2549d01292f4609e811ec2862dd5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
