Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75661
Change subject: Move /etc/puppet symlinks back to a normal place on virt0
......................................................................
Move /etc/puppet symlinks back to a normal place on virt0
Change-Id: I2ef88ab7eee10491271e6b9a40db9600c2521522
---
M manifests/puppetmaster.pp
1 file changed, 25 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/75661/1
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index 3bda90a..4757293 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -180,45 +180,12 @@
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 => "/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,
+ file { '/etc/puppet/private':
+ ensure => link,
+ target => "${gitdir}/operations/labs/private",
+ force => true,
}
}
@@ -236,6 +203,27 @@
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/75661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ef88ab7eee10491271e6b9a40db9600c2521522
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
