Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/379713 )
Change subject: Remove obsolete role::salt::masters::production class
......................................................................
Remove obsolete role::salt::masters::production class
Change-Id: I5adccac6f3f9f58f3aa47652ce109722f0844771
---
D modules/role/manifests/salt/masters/production.pp
1 file changed, 0 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/379713/1
diff --git a/modules/role/manifests/salt/masters/production.pp
b/modules/role/manifests/salt/masters/production.pp
deleted file mode 100644
index fd63d74..0000000
--- a/modules/role/manifests/salt/masters/production.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-class role::salt::masters::production {
-
- $salt_state_roots = { 'base' => '/srv/salt' }
- $salt_file_roots = { 'base' => '/srv/salt' }
- $salt_pillar_roots = { 'base' => '/srv/pillars' }
- $salt_module_roots = { 'base' => '/srv/salt/_modules' }
- $salt_returner_roots = { 'base' => '/srv/salt/_returners' }
-
-
- # TODO: do not hardcode salt_peer_run
- class { 'salt::master':
- salt_runner_dir => '/srv/runners',
- salt_peer_run => {
- 'tin.eqiad.wmnet' => ['deploy.*'],
- 'naos.codfw.wmnet' => ['deploy.*'],
- 'puppetmaster1001.eqiad.wmnet' => ['keys.*', 'test.*'],
- 'puppetmaster2001.codfw.wmnet' => ['keys.*', 'test.*'],
- },
- salt_file_roots => $salt_file_roots,
- salt_pillar_roots => $salt_pillar_roots,
- salt_worker_threads => '30',
- salt_state_roots => $salt_state_roots,
- salt_module_roots => $salt_module_roots,
- salt_returner_roots => $salt_returner_roots,
- }
-
- class { 'salt::master::key':
- salt_master_pubkey_type => 'prod',
- }
-
- ferm::service { 'salt_master_job_publisher':
- proto => 'tcp',
- port => '4505',
- srange => '$PRODUCTION_NETWORKS',
- }
-
- ferm::service { 'salt_master_minion_returns':
- proto => 'tcp',
- port => '4506',
- srange => '$PRODUCTION_NETWORKS',
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/379713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5adccac6f3f9f58f3aa47652ce109722f0844771
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
