From ccb8425bf409704dd2819b3db75e5c45dc4422c9 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 2 Nov 2012 15:13:51 +0000
Subject: [PATCH] Normalize IRC server name references.

Freenode recommends relying on chat.freenode.net as their round-robin
server name:

    http://freenode.net/irc_servers.shtml

Based on a discussion with their admins, the regional round-robin
entries are not regularly groomed (leading to earlier connectivity
issues for meetbot). This change aligns all IRC server names used in
OpenStack Puppet configuration with that recommendation.

Change-Id: Id34c27427c3af741589a287802164bf7ffa9a6ea
Reviewed-on: https://review.openstack.org/15277
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 doc/source/gerrit.rst                            | 2 +-
 doc/source/puppet_modules.rst                    | 2 +-
 modules/openstack_project/manifests/eavesdrop.pp | 2 +-
 modules/openstack_project/manifests/review.pp    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/source/gerrit.rst b/doc/source/gerrit.rst
index f130f39c6d..5d85ceb739 100644
--- a/doc/source/gerrit.rst
+++ b/doc/source/gerrit.rst
@@ -532,7 +532,7 @@ gerritbot.config file:
   [ircbot]
   nick=NICNAME
   pass=PASSWORD
-  server=irc.freenode.net
+  server=chat.freenode.net
   channel=openstack-dev
   port=6667
 
diff --git a/doc/source/puppet_modules.rst b/doc/source/puppet_modules.rst
index 1d28fe70d6..ad2ba6e107 100644
--- a/doc/source/puppet_modules.rst
+++ b/doc/source/puppet_modules.rst
@@ -145,7 +145,7 @@ To use this module simply add a section to the site manifest as follows:
      meetbot::site { "openstack":
        nick => "openstack",
        network => "FreeNode",
-       server => "chat.us.freenode.net:7000",
+       server => "chat.freenode.net:7000",
        url => "eavesdrop.openstack.org",
        channels => "#openstack #openstack-dev #openstack-meeting",
        use_ssl => "True"
diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp
index fcc1870431..e6db52bf01 100644
--- a/modules/openstack_project/manifests/eavesdrop.pp
+++ b/modules/openstack_project/manifests/eavesdrop.pp
@@ -12,7 +12,7 @@ class openstack_project::eavesdrop (
     nick      => 'openstack',
     nickpass  => $nickpass,
     network   => 'FreeNode',
-    server    => 'niven.freenode.net:7000',
+    server    => 'chat.freenode.net:7000',
     channels  => '#openstack #openstack-dev #openstack-meeting',
     use_ssl   => 'True'
   }
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 33d8322026..b1aae1c5b8 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -81,7 +81,7 @@ class openstack_project::review (
   class { 'gerritbot':
     nick => 'openstackgerrit',
     password => $gerritbot_password,
-    server => 'irc.freenode.net',
+    server => 'chat.freenode.net',
     user => 'gerritbot',
     vhost_name => $fqdn
   }