[MediaWiki-commits] [Gerrit] Update references to ubuntu.wikimedia.org - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: Update references to ubuntu.wikimedia.org .. Update references to ubuntu.wikimedia.org We use just mirrors.wikimedia.org nowadays. Change-Id: I8487e5de6e11be1c4d3c5ac78ff8aec216d6b4c5 --- M modules/install_server/files/autoinstall/trusty.cfg M modules/labs_vmbuilder/templates/vmbuilder.cfg.erb 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/install_server/files/autoinstall/trusty.cfg b/modules/install_server/files/autoinstall/trusty.cfg index cfb1da9..d93d1fe 100644 --- a/modules/install_server/files/autoinstall/trusty.cfg +++ b/modules/install_server/files/autoinstall/trusty.cfg @@ -3,7 +3,7 @@ # Default mirror, can be overridden per subnet d-imirror/country string manual -d-imirror/http/hostnamestring ubuntu.wikimedia.org +d-imirror/http/hostnamestring mirrors.wikimedia.org d-imirror/http/directory string /ubuntu/ d-imirror/http/proxy string diff --git a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb index 38d2e9e..62ed470 100644 --- a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb +++ b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb @@ -13,7 +13,7 @@ [ubuntu] suite = <%= lsbdistcodename %> flavour = virtual -mirror = http://ubuntu.wikimedia.org/ubuntu/ +mirror = http://mirrors.wikimedia.org/ubuntu/ components = main,restricted,multiverse,universe <% if scope.function_os_version(['ubuntu >= trusty']) %> addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git, 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, virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry, nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, jq -- To view, visit https://gerrit.wikimedia.org/r/300559 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8487e5de6e11be1c4d3c5ac78ff8aec216d6b4c5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis Gerrit-Reviewer: Faidon Liambotis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update references to ubuntu.wikimedia.org - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/300559 Change subject: Update references to ubuntu.wikimedia.org .. Update references to ubuntu.wikimedia.org We use just mirrors.wikimedia.org nowadays. Change-Id: I8487e5de6e11be1c4d3c5ac78ff8aec216d6b4c5 --- M modules/install_server/files/autoinstall/trusty.cfg M modules/labs_vmbuilder/templates/vmbuilder.cfg.erb 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/59/300559/1 diff --git a/modules/install_server/files/autoinstall/trusty.cfg b/modules/install_server/files/autoinstall/trusty.cfg index cfb1da9..d93d1fe 100644 --- a/modules/install_server/files/autoinstall/trusty.cfg +++ b/modules/install_server/files/autoinstall/trusty.cfg @@ -3,7 +3,7 @@ # Default mirror, can be overridden per subnet d-imirror/country string manual -d-imirror/http/hostnamestring ubuntu.wikimedia.org +d-imirror/http/hostnamestring mirrors.wikimedia.org d-imirror/http/directory string /ubuntu/ d-imirror/http/proxy string diff --git a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb index 38d2e9e..62ed470 100644 --- a/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb +++ b/modules/labs_vmbuilder/templates/vmbuilder.cfg.erb @@ -13,7 +13,7 @@ [ubuntu] suite = <%= lsbdistcodename %> flavour = virtual -mirror = http://ubuntu.wikimedia.org/ubuntu/ +mirror = http://mirrors.wikimedia.org/ubuntu/ components = main,restricted,multiverse,universe <% if scope.function_os_version(['ubuntu >= trusty']) %> addpkg = coreutils, snmp, wipe, tzdata, zsh-beta, jfsutils, xfsprogs, screen, gdb, iperf, atop, htop, vim, sysstat, ngrep, acct, git, 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, virt-what, ldapvi, ack-grep, ethtool, debian-goodies, python-redis, python-apt, python-statsd, apt-show-versions, pv, nagios-plugins-standard, httpry, nagios-plugins, linux-tools-generic, puppet-lint, tree, nagios-plugins-basic, jq -- To view, visit https://gerrit.wikimedia.org/r/300559 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8487e5de6e11be1c4d3c5ac78ff8aec216d6b4c5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits