Alexandros Kosiaris has submitted this change and it was merged.

Change subject: brewster to carbon migration
......................................................................


brewster to carbon migration

Changed to point to carbon:
 * HTTP/APT Proxy configurations
 * TFTP configurations

Removed:
 * DHCP configurations for brewster
 * amanda configurations
 * dsh configurations

Change-Id: Id284e7f2a17a8c1949477c7bd584883f914366a2
RT: 6133
---
M files/backup/disklist-daily
M files/dsh/group/ALL
M files/dsh/group/misc_pmtpa
M files/dsh/group/pmtpa
M manifests/site.pp
M modules/apt/manifests/init.pp
M modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/analytics1-c-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/pmtpa-internal.cfg
M modules/install-server/files/autoinstall/subnets/pmtpa-virt.cfg
M modules/install-server/files/autoinstall/subnets/private1-a-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-b-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-c-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-d-eqiad.cfg
M modules/install-server/files/autoinstall/subnets/private1-ulsfo.cfg
M modules/install-server/files/dhcpd/dhcpd.conf
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
M modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
M modules/puppetmaster/manifests/geoip.pp
M templates/misc/dupload.conf.erb
25 files changed, 42 insertions(+), 56 deletions(-)

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



diff --git a/files/backup/disklist-daily b/files/backup/disklist-daily
index afdc411..d0dfba8 100644
--- a/files/backup/disklist-daily
+++ b/files/backup/disklist-daily
@@ -1,7 +1,4 @@
 mchenry.wikimedia.org   /root default
-brewster.wikimedia.org /srv/wikimedia  default
-brewster.wikimedia.org /srv/autoinstall        default
-brewster.wikimedia.org /srv/tftpboot   default
 sanger.wikimedia.org   /var/vmail      default
 nfs1.pmtpa.wmnet        /var/opendj/backups default
 nfs2.pmtpa.wmnet        /var/opendj/backups default
diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL
index bac90cf..d07e261 100644
--- a/files/dsh/group/ALL
+++ b/files/dsh/group/ALL
@@ -62,7 +62,6 @@
 snapshot1003
 snapshot1004
 tridge
-brewster
 dobson
 linne
 
diff --git a/files/dsh/group/misc_pmtpa b/files/dsh/group/misc_pmtpa
index eb7c52e..4c48877 100644
--- a/files/dsh/group/misc_pmtpa
+++ b/files/dsh/group/misc_pmtpa
@@ -1,4 +1,3 @@
-brewster
 dobson
 ekrem
 emery
diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa
index 02bfd96..f48935a 100644
--- a/files/dsh/group/pmtpa
+++ b/files/dsh/group/pmtpa
@@ -1,4 +1,3 @@
-brewster
 dobson
 fenari
 formey
diff --git a/manifests/site.pp b/manifests/site.pp
index 50377d8..5a55aad 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -314,9 +314,6 @@
 }
 
 node 'brewster.wikimedia.org' {
-
-    $tftpboot_server_type = 'master'
-
     include standard
     include role::installserver
     include backup::client
diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index ed76f86..ec8596d 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -51,22 +51,22 @@
             ensure   => absent,
             priority => '80',
             key      => 'Acquire::http::Proxy',
-            value    => 'http://brewster.wikimedia.org:8080';
+            value    => 'http://carbon.wikimedia.org:8080';
         'security-ubuntu-proxy':
             ensure   => $enable_proxy,
             priority => '80',
             key      => 'Acquire::http::Proxy::security.ubuntu.com',
-            value    => 'http://brewster.wikimedia.org:8080';
+            value    => 'http://carbon.wikimedia.org:8080';
         'ubuntu-cloud-archive-proxy':
             ensure   => $enable_proxy,
             priority => '80',
             key      => 
'Acquire::http::Proxy::ubuntu-cloud.archive.canonical.com',
-            value    => 'http://brewster.wikimedia.org:8080';
+            value    => 'http://carbon.wikimedia.org:8080';
         'old-releases-proxy':
             ensure   => $enable_proxy,
             priority => '80',
             key      => 'Acquire::http::Proxy::old-releases.ubuntu.com',
-            value    => 'http://brewster.wikimedia.org:8080';
+            value    => 'http://carbon.wikimedia.org:8080';
     }
 
     # apt-get should not install recommended packages
diff --git 
a/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg 
b/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg
index f2dc8ba..1a0b155 100644
--- a/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/subnets/analytics1-b-eqiad.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git 
a/modules/install-server/files/autoinstall/subnets/analytics1-c-eqiad.cfg 
b/modules/install-server/files/autoinstall/subnets/analytics1-c-eqiad.cfg
index 5654cb9..f1326ef 100644
--- a/modules/install-server/files/autoinstall/subnets/analytics1-c-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/subnets/analytics1-c-eqiad.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git 
a/modules/install-server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg 
b/modules/install-server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg
index 95a44eb..d457473 100644
--- a/modules/install-server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git 
a/modules/install-server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg 
b/modules/install-server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg
index 6be9f35..383cdb5 100644
--- a/modules/install-server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git 
a/modules/install-server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg 
b/modules/install-server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg
index 5654cb9..f1326ef 100644
--- a/modules/install-server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git 
a/modules/install-server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg 
b/modules/install-server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg
index 565f382..ec1adbb 100644
--- a/modules/install-server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git 
a/modules/install-server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg 
b/modules/install-server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg
index 095aea7..2f4ab14 100644
--- a/modules/install-server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git 
a/modules/install-server/files/autoinstall/subnets/pmtpa-internal.cfg 
b/modules/install-server/files/autoinstall/subnets/pmtpa-internal.cfg
index c3318a3..7bdd1c9 100644
--- a/modules/install-server/files/autoinstall/subnets/pmtpa-internal.cfg
+++ b/modules/install-server/files/autoinstall/subnets/pmtpa-internal.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.152.131 208.80.152.132
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.pmtpa.wmnet
diff --git a/modules/install-server/files/autoinstall/subnets/pmtpa-virt.cfg 
b/modules/install-server/files/autoinstall/subnets/pmtpa-virt.cfg
index 56f952b..cd49e40 100644
--- a/modules/install-server/files/autoinstall/subnets/pmtpa-virt.cfg
+++ b/modules/install-server/files/autoinstall/subnets/pmtpa-virt.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.152.131 208.80.152.132
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.pmtpa.wmnet
diff --git 
a/modules/install-server/files/autoinstall/subnets/private1-a-eqiad.cfg 
b/modules/install-server/files/autoinstall/subnets/private1-a-eqiad.cfg
index 761a211..7a26b0f 100644
--- a/modules/install-server/files/autoinstall/subnets/private1-a-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/subnets/private1-a-eqiad.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git 
a/modules/install-server/files/autoinstall/subnets/private1-b-eqiad.cfg 
b/modules/install-server/files/autoinstall/subnets/private1-b-eqiad.cfg
index 42da85b..e82b10d 100644
--- a/modules/install-server/files/autoinstall/subnets/private1-b-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/subnets/private1-b-eqiad.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git 
a/modules/install-server/files/autoinstall/subnets/private1-c-eqiad.cfg 
b/modules/install-server/files/autoinstall/subnets/private1-c-eqiad.cfg
index 5ffe8b0..4e85bb8 100644
--- a/modules/install-server/files/autoinstall/subnets/private1-c-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/subnets/private1-c-eqiad.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git 
a/modules/install-server/files/autoinstall/subnets/private1-d-eqiad.cfg 
b/modules/install-server/files/autoinstall/subnets/private1-d-eqiad.cfg
index 7c23915..894203a 100644
--- a/modules/install-server/files/autoinstall/subnets/private1-d-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/subnets/private1-d-eqiad.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.154.239 208.80.152.131
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git 
a/modules/install-server/files/autoinstall/subnets/private1-ulsfo.cfg 
b/modules/install-server/files/autoinstall/subnets/private1-ulsfo.cfg
index 643694d..756167f 100644
--- a/modules/install-server/files/autoinstall/subnets/private1-ulsfo.cfg
+++ b/modules/install-server/files/autoinstall/subnets/private1-ulsfo.cfg
@@ -9,7 +9,7 @@
 d-i    netcfg/get_nameservers  string  208.80.152.131 208.80.152.132
 d-i    netcfg/confirm_static   boolean true
 
-d-i    mirror/http/proxy       string  http://brewster.wikimedia.org:8080
+d-i    mirror/http/proxy       string  http://carbon.wikimedia.org:8080
 
 # NTP
 d-i    clock-setup/ntp-server  string  ntp.eqiad.wmnet
diff --git a/modules/install-server/files/dhcpd/dhcpd.conf 
b/modules/install-server/files/dhcpd/dhcpd.conf
index 7f341ec..ac62d18 100644
--- a/modules/install-server/files/dhcpd/dhcpd.conf
+++ b/modules/install-server/files/dhcpd/dhcpd.conf
@@ -34,7 +34,7 @@
        option routers 208.80.152.1;
        option domain-name "wikimedia.org";
 
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # Public services subnet
@@ -46,7 +46,7 @@
        option routers 208.80.152.129;
        option domain-name "wikimedia.org";
 
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # Public services subnet
@@ -58,7 +58,7 @@
     option routers 208.80.153.129;
     option domain-name "wikimedia.org";
 
-    next-server 208.80.152.171; # brewster (tftp server)
+    next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # Private subnet
@@ -70,7 +70,7 @@
        option routers 10.0.0.200;
        option domain-name "pmtpa.wmnet";
 
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # Management subnet
@@ -81,7 +81,7 @@
        option broadcast-address 10.1.255.255;
        option routers 10.1.0.1;
 
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # pmtpa private virtual host subnet
@@ -93,7 +93,7 @@
        option routers 10.4.16.1;
        option domain-name "pmtpa.wmnet";
 
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 #
@@ -109,7 +109,7 @@
        option routers 208.80.154.1;
        option domain-name "wikimedia.org";
 
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # public1-b-eqiad
@@ -122,7 +122,7 @@
        option domain-name "wikimedia.org";
 
        #next-server 208.80.154.10; # carbon (tftp server)
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # public1-c-eqiad
@@ -135,7 +135,7 @@
        option domain-name "wikimedia.org";
 
        #next-server 208.80.154.10; # carbon (tftp server)
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # public1-d-eqiad
@@ -148,7 +148,7 @@
        option domain-name "wikimedia.org";
 
        #next-server 208.80.154.10; # carbon (tftp server)
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # sandbox1-b-eqiad
@@ -161,7 +161,7 @@
        option domain-name "wikimedia.org";
 
        #next-server 208.80.154.10; # carbon (tftp server)
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # private1-a-eqiad
@@ -174,7 +174,7 @@
        option domain-name "eqiad.wmnet";
 
        #next-server 208.80.154.10; # carbon (tftp server)
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # private1-b-eqiad
@@ -187,7 +187,7 @@
        option domain-name "eqiad.wmnet";
 
        #next-server 208.80.154.10; # carbon (tftp server)
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # private1-c-eqiad
@@ -200,7 +200,7 @@
        option domain-name "eqiad.wmnet";
 
        #next-server 208.80.154.10; # carbon (tftp server)
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # private1-d-eqiad
@@ -213,7 +213,7 @@
        option domain-name "eqiad.wmnet";
 
        #next-server 208.80.154.10; # carbon (tftp server)
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # labs-hosts1-b-eqiad subnet
@@ -226,7 +226,7 @@
        option domain-name "eqiad.wmnet";
 
        #next-server 208.80.154.10; # carbon (tftp server)
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # labs-hosts1-c-eqiad subnet
@@ -239,7 +239,7 @@
        option domain-name "eqiad.wmnet";
 
        #next-server 208.80.154.10; # carbon (tftp server)
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # analytics1-b-eqiad subnet
@@ -252,7 +252,7 @@
        option domain-name "eqiad.wmnet";
 
        #next-server 208.80.154.10; # carbon (tftp server)
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 # analytics1-c-eqiad subnet
@@ -265,7 +265,7 @@
        option domain-name "eqiad.wmnet";
 
        #next-server 208.80.154.10; # carbon (tftp server)
-       next-server 208.80.152.171; # brewster (tftp server)
+       next-server 208.80.154.10; # carbon (tftp server)
 }
 
 #
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600 
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
index f26d42e..b7931ae 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600
@@ -3,11 +3,6 @@
 #### puppet:///files/dhcpd/linux-host-entries.ttyS1-57600
 ######################################################################
 
-host brewster {
-       hardware ethernet 00:1e:c9:ea:ab:7d;
-       fixed-address brewster.wikimedia.org;
-}
-
 host db10 {
        hardware ethernet 00:18:8B:42:06:00;
        fixed-address db10.pmtpa.wmnet;
diff --git a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb 
b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
index 68c9576..b07f6ae 100644
--- a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
+++ b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb
@@ -14,7 +14,7 @@
 [ubuntu]
 suite = <%= lsbdistcodename %>
 flavour = virtual
-proxy = http://brewster.wikimedia.org:8080
+proxy = http://carbon.wikimedia.org:8080
 mirror = http://ubuntu.wikimedia.org/ubuntu/
 components = main,restricted,multiverse,universe
 addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, 
gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git-core, lldpd, emacs23, 
libpam-ldapd, ldap-utils, libnss-ldapd, nss-updatedb, libnss-db, nscd, 
libpam-ldapd, python-ldap, python-pycurl, openssl, ca-certificates, ssl-cert, 
rsyslog, exim4-config, exim4-daemon-light, cloud-init, cloud-utils, euca2ools, 
openssh-server, curl, apparmor, libapparmor1, ubuntu-standard, nfs-client
diff --git a/modules/puppetmaster/manifests/geoip.pp 
b/modules/puppetmaster/manifests/geoip.pp
index 2d3a91d..9b3e1c9 100644
--- a/modules/puppetmaster/manifests/geoip.pp
+++ b/modules/puppetmaster/manifests/geoip.pp
@@ -4,7 +4,7 @@
     # normal puppet File resource (see the geoip module for more)
 
     $geoip_destdir = "${puppetmaster::volatiledir}/GeoIP"
-    $environment = 'http_proxy=http://brewster.wikimedia.org:8080'
+    $environment = 'http_proxy=http://carbon.wikimedia.org:8080'
 
     # geoip::data classes depend on this
     file { $geoip_destdir:
diff --git a/templates/misc/dupload.conf.erb b/templates/misc/dupload.conf.erb
index 534a26a..4188842 100644
--- a/templates/misc/dupload.conf.erb
+++ b/templates/misc/dupload.conf.erb
@@ -140,9 +140,9 @@
 #      nonus => 1,
 #};
 
-# Wikimedia APT repository on brewster
+# Wikimedia APT repository on carbon
 $cfg{'wikimedia'} = {
-       fqdn => "brewster.wikimedia.org",
+       fqdn => "carbon.wikimedia.org",
        login => "root",
        method => "scpb",
        incoming => "/srv/wikimedia/incoming/",
@@ -154,4 +154,4 @@
 
 ## Local Variables: ##
 ## mode:perl ##
-## End: ##
\ No newline at end of file
+## End: ##

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id284e7f2a17a8c1949477c7bd584883f914366a2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to