Ryan Lane has uploaded a new change for review.
https://gerrit.wikimedia.org/r/89126
Change subject: Add roles for testing sartoris in labs
......................................................................
Add roles for testing sartoris in labs
Properly testing sartoris in labs requires a puppet master, a
salt master, and a deployment server. This change adds the latter
two as roles.
Change-Id: I58f06b45bbe35457423307b5ea6db5d400577ee9
---
M manifests/role/deployment.pp
M manifests/role/salt.pp
2 files changed, 48 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/26/89126/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 44f5fb2..4a4340a 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -117,6 +117,26 @@
}
}
+class role::deployment::salt_masters::sartoris {
+ $deployment_config = {
+ 'repo_locations' => '/srv/deployment',
+ 'servers' => {
+ 'pmtpa' => 'i-00000823.pmtpa.wmflabs',
+ 'eqiad' => 'i-00000823.pmtpa.wmflabs',
+ },
+ 'redis' => {
+ 'host' => 'i-00000823.pmtpa.wmflabs',
+ 'port' => '6379',
+ 'db' => '0',
+ },
+ }
+ class { '::role::deployment::config': }
+ class { 'deployment::salt_master':
+ repo_config => $role::deployment::config::repo_config,
+ deployment_config => $deployment_config,
+ }
+}
+
class role::deployment::deployment_servers::common {
# Can't include this while scap is present on tin:
# include misc::deployment::scripts
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 8a954de..9e94636 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -65,6 +65,34 @@
}
+class role::salt::masters::sartoris {
+
+ $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"]}
+
+ class { "salt::master":
+ salt_runner_dirs => ["/srv/runners"],
+ salt_peer_run => {
+ "i-00000822.pmtpa.wmflabs" => ['deploy.*'],
+ },
+ salt_file_roots => $salt_file_roots,
+ salt_pillar_roots => $salt_pillar_roots,
+ salt_worker_threads => "10",
+ }
+
+ salt::master_environment{ "base":
+ salt_state_roots => $salt_state_roots,
+ salt_file_roots => $salt_file_roots,
+ salt_pillar_roots => $salt_pillar_roots,
+ salt_module_roots => $salt_module_roots,
+ salt_returner_roots => $salt_returner_roots,
+ }
+
+}
+
class role::salt::minions {
if ($realm == "labs") {
--
To view, visit https://gerrit.wikimedia.org/r/89126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I58f06b45bbe35457423307b5ea6db5d400577ee9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
