[MediaWiki-commits] [Gerrit] Avoid using regexps where string literals would do - change (operations/puppet)

[Faidon (Code Review)]

Faidon has submitted this change and it was merged.

Change subject: Avoid using regexps where string literals would do
......................................................................


Avoid using regexps where string literals would do

There's no sense in using a regular expression to match a single fixed string
that is known in advance.

Change-Id: Ia0e83b2b22f4715d4b495636447e6a0e2d4e7901
---
M manifests/site.pp
1 file changed, 14 insertions(+), 12 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index eadc668..2992eb2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -515,12 +515,12 @@
 }
 
 ## researchdb
-node /^db67\.pmtpa\.wmnet/ {
+node 'db67.pmtpa.wmnet' {
        class { role::coredb::researchdb : mariadb => true }
 }
 
 ## pgehres special project
-node /^db29\.pmtpa\.wmnet/{
+node 'db29.pmtpa.wmnet' {
        $gid = 500
        system_role { "role::admin_tools_sul_audit_db": description => "Admin 
Tools/SUL Audit database" }
        include base,
@@ -642,12 +642,15 @@
 }
 
 ## researchdb
-node /^db1047\.eqiad\.wmnet/ {
-       class { role::coredb::researchdb : mariadb => true, 
innodb_file_per_table => true }
+node 'db1047.eqiad.wmnet' {
+       class { role::coredb::researchdb :
+               mariadb => true,
+               innodb_file_per_table => true,
+       }
 }
 
 ## SANITARIUM
-node /^db1053\.eqiad\.wmnet/ {
+node 'db1053.eqiad.wmnet' {
        class { role::db::sanitarium:
                instances => {
                        's1' => {
@@ -659,7 +662,7 @@
        }
 }
 
-node /^db1054\.eqiad\.wmnet/ {
+node 'db1054.eqiad.wmnet' {
        class { role::db::sanitarium:
                instances => {
                        's2' => {
@@ -681,7 +684,7 @@
        }
 }
 
-node /^db1057\.eqiad\.wmnet/ {
+node 'db1057.eqiad.wmnet' {
        class { role::db::sanitarium:
                instances => {
                        's3' => {
@@ -1186,7 +1189,7 @@
 }
 
 ## labsdb dbs
-node /^labsdb1001\.eqiad\.wmnet/ {
+node 'labsdb1001.eqiad.wmnet' {
   class { role::db::labsdb:
     instances => {
       's1' => {
@@ -1198,7 +1201,7 @@
   }
 }
 
-node /^labsdb1002\.eqiad\.wmnet/ {
+node 'labsdb1002.eqiad.wmnet' {
   class { role::db::labsdb:
     instances => {
       's2' => {
@@ -1220,7 +1223,7 @@
   }
 }
 
-node /^labsdb1003\.eqiad\.wmnet/ {
+node 'labsdb1003.eqiad.wmnet' {
   class { role::db::labsdb:
     instances => {
       's3' => {
@@ -2779,14 +2782,13 @@
                backup::client
 }
 
-node /virt2.pmtpa.wmnet/ {
+node 'virt2.pmtpa.wmnet' {
        $cluster = "virt"
        $openstack_version = "essex"
 
        include standard,
                role::nova::network,
                role::nova::api
-
 }
 
 node /virt([5-9]|1[0-1]).pmtpa.wmnet/ {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0e83b2b22f4715d4b495636447e6a0e2d4e7901
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Faidon <fai...@wikimedia.org>
Gerrit-Reviewer: MZMcBride <w...@mzmcbride.com>
Gerrit-Reviewer: jenkins-bot

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