Yuvipanda has submitted this change and it was merged.
Change subject: deployment: Unify salt_masters role for prod / labs
......................................................................
deployment: Unify salt_masters role for prod / labs
Bug: T86885
Change-Id: Id088ab43f6b4cba58552c75a74eb70361faaaff1
---
M manifests/role/deployment.pp
M manifests/site.pp
2 files changed, 9 insertions(+), 32 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 784a69c..4cfc0f6 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -117,27 +117,6 @@
}
}
-class role::deployment::salt_masters::production {
- $deployment_config = {
- 'parent_dir' => '/srv/deployment',
- 'servers' => {
- 'eqiad' => 'tin.eqiad.wmnet',
- },
- 'redis' => {
- 'host' => 'tin.eqiad.wmnet',
- '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(
# Source of the key, change this if not in production, with hiera.
$key_source = 'puppet:///private/ssh/tin/mwdeploy_rsa',
@@ -223,17 +202,15 @@
}
}
-class role::deployment::salt_masters::labs {
- # Enable multiple test environments within a single project
- if ( $::deployment_server_override != undef ) {
- $deployment_server = $::deployment_server_override
- } else {
- $deployment_server = "${::instanceproject}-deploy.eqiad.wmflabs"
- }
+class role::deployment::salt_masters(
+ $deployment_server = 'tin.eqiad.wmnet',
+) {
$deployment_config = {
'parent_dir' => '/srv/deployment',
- 'servers' => { 'eqiad' => $deployment_server, },
+ 'servers' => {
+ 'eqiad' => $deployment_server,
+ },
'redis' => {
'host' => $deployment_server,
'port' => '6379',
diff --git a/manifests/site.pp b/manifests/site.pp
index 5498f80..482029b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2062,7 +2062,7 @@
include admin
include role::ipmi
include role::salt::masters::production
- include role::deployment::salt_masters::production
+ include role::deployment::salt_masters
include role::access_new_install
include role::puppetmaster::frontend
include role::pybal_config
@@ -2515,7 +2515,7 @@
include role::nova::controller
include role::nova::manager
include role::salt::masters::labs
- include role::deployment::salt_masters::labs
+ include role::deployment::salt_masters
if $use_neutron == true {
include role::neutron::controller
@@ -2539,7 +2539,7 @@
#include role::nova::controller
#include role::nova::manager
#include role::salt::masters::labs
- #include role::deployment::salt_masters::labs
+ #include role::deployment::salt_masters
}
# Eqiad ldap server, aka ldap-eqiad
--
To view, visit https://gerrit.wikimedia.org/r/185137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id088ab43f6b4cba58552c75a74eb70361faaaff1
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
