[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: Allow db2034 reinstall as stretch

2018-01-18 Thread Marostegui (Code Review)
Marostegui has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404955 )

Change subject: install_server: Allow db2034 reinstall as stretch
..


install_server: Allow db2034 reinstall as stretch

Also disable notifications for now in db2034

Bug: T184888
Change-Id: Idf1336ec2d1d63759d992abd3b541713366b7f24
---
M hieradata/hosts/db2034.yaml
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/hosts/db2034.yaml b/hieradata/hosts/db2034.yaml
index b1bf6dc..c26f32a 100644
--- a/hieradata/hosts/db2034.yaml
+++ b/hieradata/hosts/db2034.yaml
@@ -1,2 +1,3 @@
 mariadb::shard: 's1'
 mariadb::socket: '/tmp/mysql.sock'
+profile::base::notifications_enabled: '0'
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 829db76..995a601 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -67,7 +67,7 @@
 cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \
 cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
 db111[3-4]) echo partman/db.cfg ;; \
-db2078|db2090|db2092) echo partman/db.cfg ;; \
+db2034|db2078|db2090|db2092) echo partman/db.cfg ;; \
 db[12][01][0-9][0-9]|dbstore[12]00[1-9]|es[12]01[1-9]) echo 
partman/db-no-srv-format.cfg ;; \
 deploy[12]001|flerovium|furud) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg;; \
 d-i-test) echo partman/flat.cfg virtual.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 0171c34..8095900 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1801,8 +1801,6 @@
 host db2034 {
 hardware ethernet a0:d3:c1:fa:2d:80;
 fixed-address db2034.codfw.wmnet;
-option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/";;
-filename "lpxelinux.0";
 }
 
 host db2035 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf1336ec2d1d63759d992abd3b541713366b7f24
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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


[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: Allow db2034 reinstall as stretch

2018-01-18 Thread Marostegui (Code Review)
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404955 )

Change subject: install_server: Allow db2034 reinstall as stretch
..

install_server: Allow db2034 reinstall as stretch

Bug: T184888
Change-Id: Idf1336ec2d1d63759d992abd3b541713366b7f24
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/404955/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 829db76..995a601 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -67,7 +67,7 @@
 cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \
 cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
 db111[3-4]) echo partman/db.cfg ;; \
-db2078|db2090|db2092) echo partman/db.cfg ;; \
+db2034|db2078|db2090|db2092) echo partman/db.cfg ;; \
 db[12][01][0-9][0-9]|dbstore[12]00[1-9]|es[12]01[1-9]) echo 
partman/db-no-srv-format.cfg ;; \
 deploy[12]001|flerovium|furud) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg;; \
 d-i-test) echo partman/flat.cfg virtual.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 0171c34..8095900 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1801,8 +1801,6 @@
 host db2034 {
 hardware ethernet a0:d3:c1:fa:2d:80;
 fixed-address db2034.codfw.wmnet;
-option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/";;
-filename "lpxelinux.0";
 }
 
 host db2035 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf1336ec2d1d63759d992abd3b541713366b7f24
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 

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