Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/137929
Change subject: puppetsigner: actually use the file in the repository
......................................................................
puppetsigner: actually use the file in the repository
Change-Id: I97eeeebedc59388217f3472821419712243eca2f
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
R modules/puppetmaster/files/puppetsigner.py
M modules/puppetmaster/manifests/labs.pp
2 files changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/137929/1
diff --git a/modules/ldap/files/scripts/puppetsigner.py
b/modules/puppetmaster/files/puppetsigner.py
similarity index 100%
rename from modules/ldap/files/scripts/puppetsigner.py
rename to modules/puppetmaster/files/puppetsigner.py
diff --git a/modules/puppetmaster/manifests/labs.pp
b/modules/puppetmaster/manifests/labs.pp
index 05588f0..9b47e70 100644
--- a/modules/puppetmaster/manifests/labs.pp
+++ b/modules/puppetmaster/manifests/labs.pp
@@ -7,8 +7,11 @@
# a known and approved version of this script.
file {
'/usr/local/sbin/puppetsigner.py':
- ensure => link,
- target => '/usr/local/lib/instance-management/puppetsigner.py',
+ ensure => present,
+ source => 'puppet:///modules/puppetmaster/puppetsigner.py',
+ mode => '0550',
+ owner => 'root',
+ group => 'root'
}
cron {
@@ -39,7 +42,7 @@
$labsstatus_username = 'novaadmin'
$labsstatus_region = $::site
$labsstatus_auth_url = 'http://virt0.wikimedia.org:35357/v2.0'
-
+
file { '/etc/labsstatus.cfg':
ensure => present,
content => template('puppetmaster/labsstatus.cfg.erb'),
--
To view, visit https://gerrit.wikimedia.org/r/137929
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97eeeebedc59388217f3472821419712243eca2f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
