Dzahn has submitted this change and it was merged.
Change subject: rancid - move to module
......................................................................
rancid - move to module
another one to be moved out of 'misc'
and into module format
Change-Id: I6f1f40a49ffbfc835952b6274627a5e0d4a2e062
---
A manifests/role/rancid.pp
M manifests/site.pp
R modules/rancid/files/core/router.db
R modules/rancid/files/rancid.conf
R modules/rancid/files/rancid.cron
R modules/rancid/manifests/init.pp
R modules/rancid/templates/cloginrc.erb
7 files changed, 16 insertions(+), 13 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/rancid.pp b/manifests/role/rancid.pp
new file mode 100644
index 0000000..dfcd241
--- /dev/null
+++ b/manifests/role/rancid.pp
@@ -0,0 +1,9 @@
+class role::rancid {
+
+ system::role { 'role::rancid':
+ description => 'Really Awful Notorious CIsco config Differ (sp)'
+ }
+
+ include ::rancid
+}
+
diff --git a/manifests/site.pp b/manifests/site.pp
index 77b2c3d..cf90a69 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2088,7 +2088,7 @@
include admin
include standard
include webserver::apache
- include misc::rancid
+ include role::rancid
include smokeping
include smokeping::web
include role::librenms
diff --git a/files/misc/rancid/core/router.db
b/modules/rancid/files/core/router.db
similarity index 100%
rename from files/misc/rancid/core/router.db
rename to modules/rancid/files/core/router.db
diff --git a/files/misc/rancid/rancid.conf b/modules/rancid/files/rancid.conf
similarity index 100%
rename from files/misc/rancid/rancid.conf
rename to modules/rancid/files/rancid.conf
diff --git a/files/misc/rancid/rancid.cron b/modules/rancid/files/rancid.cron
similarity index 100%
rename from files/misc/rancid/rancid.cron
rename to modules/rancid/files/rancid.cron
diff --git a/manifests/misc/rancid.pp b/modules/rancid/manifests/init.pp
similarity index 74%
rename from manifests/misc/rancid.pp
rename to modules/rancid/manifests/init.pp
index 5623c3b..07a43fc 100644
--- a/manifests/misc/rancid.pp
+++ b/modules/rancid/manifests/init.pp
@@ -1,11 +1,5 @@
-# misc/rancid.pp
-
-class misc::rancid {
- # TODO: finish. very incomplete.
-
- system::role { 'misc::rancid':
- description => 'Really Awful Notorious CIsco config Differ (sp)'
- }
+# Really Awful Notorious CIsco config Differ
+class rancid {
package { 'rancid':
ensure => present,
@@ -31,16 +25,16 @@
owner => 'root',
group => 'root',
mode => '0444',
- source => 'puppet:///files/misc/rancid/rancid.conf',
+ source => 'puppet:///rancid/rancid.conf',
}
file { '/var/lib/rancid/core':
require => [ Package['rancid'], User['rancid'] ],
owner => 'rancid',
group => 'rancid',
- mode => 'o-rwx',
+ mode => '0770',
recurse => remote,
- source => 'puppet:///files/misc/rancid/core',
+ source => 'puppet:///rancid/core',
}
file { '/var/lib/rancid/.cloginrc':
@@ -56,7 +50,7 @@
owner => 'root',
group => 'root',
mode => '0444',
- source => 'puppet:///files/misc/rancid/rancid.cron',
+ source => 'puppet:///rancid/rancid.cron',
}
file { '/var/log/rancid':
diff --git a/templates/rancid/cloginrc.erb
b/modules/rancid/templates/cloginrc.erb
similarity index 100%
rename from templates/rancid/cloginrc.erb
rename to modules/rancid/templates/cloginrc.erb
--
To view, visit https://gerrit.wikimedia.org/r/168698
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f1f40a49ffbfc835952b6274627a5e0d4a2e062
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: John F. Lewis <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
