Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75596
Change subject: Virt0 puppet symlinks should point to /root/testrepo/*
......................................................................
Virt0 puppet symlinks should point to /root/testrepo/*
Because that's where the cron puts things for some reason.
Change-Id: I13e3cc128a061d820416b89cdd71c1edfcf426b5
---
M manifests/puppetmaster.pp
1 file changed, 37 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/75596/1
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index 4757293..4ceb5a6 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -180,12 +180,45 @@
ensure => link,
target =>
"${gitdir}/operations/private",
force => true;
+ '/etc/puppet/templates':
+ ensure => link,
+ target =>
"${gitdir}/operations/puppet/templates",
+ force => true;
+ '/etc/puppet/files':
+ ensure => link,
+ target =>
"${gitdir}/operations/puppet/files",
+ force => true;
+ '/etc/puppet/manifests':
+ ensure => link,
+ target =>
"${gitdir}/operations/puppet/manifests",
+ force => true;
+ '/etc/puppet/modules':
+ ensure => link,
+ target =>
"${gitdir}/operations/puppet/modules",
+ force => true,
}
} else {
- file { '/etc/puppet/private':
- ensure => link,
- target => "${gitdir}/operations/labs/private",
- force => true,
+ file {
+ '/etc/puppet/private':
+ ensure => link,
+ target => "/root/testrepo/private"
+ force => true;
+ '/etc/puppet/templates':
+ ensure => link,
+ target =>
"/root/testrepo/puppet/templates"
+ force => true;
+ '/etc/puppet/files':
+ ensure => link,
+ target => "/root/testrepo/puppet/files"
+ force => true;
+ '/etc/puppet/manifests':
+ ensure => link,
+ target =>
"/root/testrepo/puppet/manifests"
+ force => true;
+ '/etc/puppet/modules':
+ ensure => link,
+ target =>
"/root/testrepo/puppet/modules"
+ force => true,
}
}
@@ -203,27 +236,6 @@
origin =>
"https://gerrit.wikimedia.org/r/p/operations/software";;
}
- # These symlinks will allow us to use /etc/puppet for the
puppetmaster to run out of.
- file { '/etc/puppet/templates':
- ensure => link,
- target => "${gitdir}/operations/puppet/templates",
- force => true,
- }
- file { '/etc/puppet/files':
- ensure => link,
- target => "${gitdir}/operations/puppet/files",
- force => true,
- }
- file { '/etc/puppet/manifests':
- ensure => link,
- target => "${gitdir}/operations/puppet/manifests",
- force => true,
- }
- file { '/etc/puppet/modules':
- ensure => link,
- target => "${gitdir}/operations/puppet/modules",
- force => true,
- }
}
# Class: puppetmaster::passenger
--
To view, visit https://gerrit.wikimedia.org/r/75596
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13e3cc128a061d820416b89cdd71c1edfcf426b5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
