Cmjohnson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/358042 )
Change subject: Merge branch 'production' of https://gerrit.wikimedia.org/r/p/operations/puppet into lold ...................................................................... Merge branch 'production' of https://gerrit.wikimedia.org/r/p/operations/puppet into lold Change-Id: I60d416bfeb464ed4a77dedb513db68d7c2b93ea1 --- M modules/install_server/files/autoinstall/netboot.cfg M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/42/358042/1 diff --git a/modules/install_server/files/autoinstall/netboot.cfg b/modules/install_server/files/autoinstall/netboot.cfg index 42de62d..0e2fa3a 100755 --- a/modules/install_server/files/autoinstall/netboot.cfg +++ b/modules/install_server/files/autoinstall/netboot.cfg @@ -50,7 +50,7 @@ baham|radon|rhodium) echo partman/raid1-lvm.cfg ;; \ analytics1017) echo partman/raid1-30G.cfg ;; \ analytics102[3-7]) echo partman/analytics-dell.cfg ;; \ - analytics102[8-9]|analytics103[0-9]|analytics104[0-9]|analytics105[0-9]|analytics106[0-9]) echo partman/analytics-flex.cfg ;; \ + analytics102[8-9]|analytics103[0-9]|analytics104[0-9]|analytics105[0-9]|analytics106[0-9]|dumpsdata100[12]) echo partman/analytics-flex.cfg ;; \ aqs100[456789]) echo partman/aqs-cassandra-8ssd-2srv.cfg ;; \ heze|neodymium|oxygen|terbium) echo partman/lvm.cfg ;; \ copper|ruthenium|subra|suhail|ocg1003) echo partman/raid1-lvm.cfg ;; \ @@ -132,7 +132,7 @@ labservices1001|labservices1002|radium|silver|uranium) echo partman/raid1.cfg ;; \ osm-cp*) echo partman/mw.cfg ;; \ ores200[1-9]) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \ - oresrdb2001|dumpsdata100[12]) echo partman/lvm-ext-srv.cfg virtual.cfg;; \ + oresrdb2001) echo partman/lvm-ext-srv.cfg virtual.cfg;; \ pc100[4-6]|pc200[4-6]) echo partman/raid0-lvm-srv.cfg ;; \ poolcounter1001) echo partman/flat.cfg virtual.cfg ;; \ poolcounter1002) echo partman/raid1-lvm-ext4-srv.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 7708b0e..edcd157 100644 --- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 +++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 @@ -1831,7 +1831,7 @@ } host dumpsdata1001 { -<<<<<<< HEAD (97129a Fixing a typo in dhcpd file) +<<<<<<< HEAD hardware ethernet 18:66:DA:FA:5E:A0; fixed-address dumpsdata1001.eqiad.wmnet; } @@ -1847,7 +1847,7 @@ host dumpsdata1002 { hardware ethernet 18:66:DA:FA:5E:A8; fixed-address dumpsdata1002.eqiad.wmnet; ->>>>>>> BRANCH (2827f4 cache: add monitoring of services at the SSL termination lev) +>>>>>>> 2827f4bb7e8b7db336f6cd19bccf37c10d45de87 } host eeden { -- To view, visit https://gerrit.wikimedia.org/r/358042 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I60d416bfeb464ed4a77dedb513db68d7c2b93ea1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Cmjohnson <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
