[MediaWiki-commits] [Gerrit] operations/puppet[production]: wikilabels: convert roles to a profile and 2 roles

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400252 )

Change subject: wikilabels: convert roles to a profile and 2 roles
......................................................................


wikilabels: convert roles to a profile and 2 roles

Change-Id: I2eb225c3d2aa678c54e8b0884113813c683d196f
---
A modules/profile/manifests/wikilabels.pp
M modules/role/manifests/wikilabels/server.pp
M modules/role/manifests/wikilabels/staging.pp
3 files changed, 20 insertions(+), 10 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/profile/manifests/wikilabels.pp 
b/modules/profile/manifests/wikilabels.pp
new file mode 100644
index 0000000..fdbf2f9
--- /dev/null
+++ b/modules/profile/manifests/wikilabels.pp
@@ -0,0 +1,12 @@
+class profile::wikilabels (
+    $branch = undefined,
+){
+
+    class { 'wikilabels::web':
+        branch => $branch,
+    }
+
+    class { '::wikilabels::db_proxy':
+        server => 'pgsql.eqiad.wmnet',
+    }
+}
diff --git a/modules/role/manifests/wikilabels/server.pp 
b/modules/role/manifests/wikilabels/server.pp
index 6805405..444daab 100644
--- a/modules/role/manifests/wikilabels/server.pp
+++ b/modules/role/manifests/wikilabels/server.pp
@@ -1,12 +1,11 @@
 # filtertags: labs-project-wikilabels
 class role::wikilabels::server {
-    class { 'wikilabels::web':
-        branch => 'deploy',
-    }
+
+    system::role { $name: }
 
     include ::wikilabels::session
 
-    class { '::wikilabels::db_proxy':
-        server => 'pgsql.eqiad.wmnet',
+    class { '::profile::wikilabels::server':
+        branch => 'deploy',
     }
 }
diff --git a/modules/role/manifests/wikilabels/staging.pp 
b/modules/role/manifests/wikilabels/staging.pp
index 7e7107c..2e54b40 100644
--- a/modules/role/manifests/wikilabels/staging.pp
+++ b/modules/role/manifests/wikilabels/staging.pp
@@ -1,12 +1,11 @@
 # filtertags: labs-project-wikilabels
 class role::wikilabels::staging {
-    class { 'wikilabels::web':
-        branch => 'master',
-    }
+
+    system::role { $name: }
 
     include ::wikilabels::session
 
-    class { '::wikilabels::db_proxy':
-        server => 'pgsql.eqiad.wmnet',
+    class { '::profile::wikilabels::server':
+        branch => 'master',
     }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/400252
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2eb225c3d2aa678c54e8b0884113813c683d196f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits