Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113955
Change subject: Add cron for manage-keys.
......................................................................
Add cron for manage-keys.
Manage-keys will run on the labs nfs server and ensure that
the keys in /keys correspond to those in ldap.
Change-Id: Ia08a330c90b628197b8bb835542aff7ac50e67b9
---
M manifests/openstack.pp
M modules/ldap/manifests/client.pp
2 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/113955/1
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 77ad815..27c0588 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -144,6 +144,14 @@
ensure => running,
require => Generic::Upstart_job["manage-volumes"];
}
+
+ cron { "Update labs ssh keys":
+ ensure => present,
+ user => root,
+ command => '/usr/local/sbin/manage-keys
--logfile=/var/log/manage-keys.log >/dev/null 2>&1'
+ hour => *,
+ minute => '*/5',
+ }
}
class openstack::project-nfs-storage-service {
diff --git a/modules/ldap/manifests/client.pp b/modules/ldap/manifests/client.pp
index 5afe9bb..884220a 100644
--- a/modules/ldap/manifests/client.pp
+++ b/modules/ldap/manifests/client.pp
@@ -197,6 +197,13 @@
source => 'puppet:///modules/ldap/scripts/manage-nfs-volumes-daemon',
}
+ file { '/usr/local/sbin/manage-keys':
+ owner => 'root',
+ group => 'root',
+ mode => '0544',
+ source => 'puppet:///modules/ldap/scripts/manage-keys',
+ }
+
file { '/usr/local/sbin/manage-volumes':
ensure => absent,
}
--
To view, visit https://gerrit.wikimedia.org/r/113955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia08a330c90b628197b8bb835542aff7ac50e67b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
