Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/343603 )

Change subject: netops: Remove domain names from iciga definitions
......................................................................


netops: Remove domain names from iciga definitions

No other device in these manifests is specified by it's FQDN so follow
the rule and specify the devices by their hostname only. They are anyway
guaranteed to be unique. This also helps with

https://gerrit.wikimedia.org/r/#/c/343036/

Change-Id: I9151ef965f77f212967f843aadf761bc4ff5a35f
---
M modules/netops/manifests/monitoring.pp
1 file changed, 15 insertions(+), 15 deletions(-)

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



diff --git a/modules/netops/manifests/monitoring.pp 
b/modules/netops/manifests/monitoring.pp
index 6f8ee2d..73b3c12 100644
--- a/modules/netops/manifests/monitoring.pp
+++ b/modules/netops/manifests/monitoring.pp
@@ -62,24 +62,24 @@
     }
     $switches = {
         # eqiad
-        'asw-a-eqiad.mgmt.eqiad.wmnet'   => { ipv4 => '10.65.0.17',   },
-        'asw2-a5-eqiad.mgmt.eqiad.wmnet' => { ipv4 => '10.65.0.20',   },
-        'asw-b-eqiad.mgmt.eqiad.wmnet'   => { ipv4 => '10.65.0.18',   },
-        'asw-c-eqiad.mgmt.eqiad.wmnet'   => { ipv4 => '10.65.0.23',   },
-        'asw-d-eqiad.mgmt.eqiad.wmnet'   => { ipv4 => '10.65.0.24',   },
-        'asw2-d-eqiad.mgmt.eqiad.wmnet'  => { ipv4 => '10.65.0.27',   },
-        'msw1-eqiad.mgmt.eqiad.wmnet'    => { ipv4 => '10.65.0.10',   },
+        'asw-a-eqiad'   => { ipv4 => '10.65.0.17',   },
+        'asw2-a5-eqiad' => { ipv4 => '10.65.0.20',   },
+        'asw-b-eqiad'   => { ipv4 => '10.65.0.18',   },
+        'asw-c-eqiad'   => { ipv4 => '10.65.0.23',   },
+        'asw-d-eqiad'   => { ipv4 => '10.65.0.24',   },
+        'asw2-d-eqiad'  => { ipv4 => '10.65.0.27',   },
+        'msw1-eqiad'    => { ipv4 => '10.65.0.10',   },
         # codfw
-        'asw-a-codfw.mgmt.codfw.wmnet'   => { ipv4 => '10.193.0.16',  },
-        'asw-b-codfw.mgmt.codfw.wmnet'   => { ipv4 => '10.193.0.17',  },
-        'asw-c-codfw.mgmt.codfw.wmnet'   => { ipv4 => '10.193.0.18',  },
-        'asw-d-codfw.mgmt.codfw.wmnet'   => { ipv4 => '10.193.0.19',  },
-        'msw1-codfw.mgmt.codfw.wmnet'    => { ipv4 => '10.193.0.3',   },
+        'asw-a-codfw'   => { ipv4 => '10.193.0.16',  },
+        'asw-b-codfw'   => { ipv4 => '10.193.0.17',  },
+        'asw-c-codfw'   => { ipv4 => '10.193.0.18',  },
+        'asw-d-codfw'   => { ipv4 => '10.193.0.19',  },
+        'msw1-codfw'    => { ipv4 => '10.193.0.3',   },
         # esams
-        'asw-esams.mgmt.esams.wmnet'     => { ipv4 => '10.21.0.104',  },
-        'csw2-esams.mgmt.esams.wmnet'    => { ipv4 => '10.21.0.105',  },
+        'asw-esams'     => { ipv4 => '10.21.0.104',  },
+        'csw2-esams'    => { ipv4 => '10.21.0.105',  },
         # ulsfo
-        'asw-ulsfo.mgmt.ulsfo.wmnet'     => { ipv4 => '10.128.128.6', },
+        'asw-ulsfo'     => { ipv4 => '10.128.128.6', },
     }
     create_resources(netops::check, $switches, $switches_defaults)
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9151ef965f77f212967f843aadf761bc4ff5a35f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@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

Reply via email to