Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/109067
Change subject: base: remove solaris from platform
......................................................................
base: remove solaris from platform
Since we don't have solaris anymore, I have cleared those from the base module.
Change-Id: I6fdfb099b14aba2a8730cd487fd12648023f697c
---
D modules/base/files/platform/99-thumper-disks.rules
D modules/base/files/platform/solaris-name.sh
M modules/base/manifests/platform.pp
3 files changed, 0 insertions(+), 75 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/109067/1
diff --git a/modules/base/files/platform/99-thumper-disks.rules
b/modules/base/files/platform/99-thumper-disks.rules
deleted file mode 100644
index 84564a2..0000000
--- a/modules/base/files/platform/99-thumper-disks.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/base/platform/99-thumper-disks.rules
-#####################################################################
-#
-# /etc/udev/rules.d/99-thumper-disks.rules
-# Written on 2009/08/15 by Mark Bergsma <m...@nedworks.org>
-#
-
-# Disk rules
-SUBSYSTEM=="block", KERNEL=="sd*[a-z]", KERNELS=="*:0:0:0",
PROGRAM="/etc/udev/scripts/solaris-name.sh %b", ENV{SOLARIS_NAME}="$result",
SYMLINK+="disk/by-cntrl/$env{SOLARIS_NAME}"
-
-# Partition rules
-SUBSYSTEM=="block", KERNEL=="sd*[a-z][0-9]*", KERNELS=="*:0:0:0",
PROGRAM="/etc/udev/scripts/solaris-name.sh %b %n", ENV{SOLARIS_NAME}="$result",
SYMLINK+="disk/by-cntrl/$env{SOLARIS_NAME}"
diff --git a/modules/base/files/platform/solaris-name.sh
b/modules/base/files/platform/solaris-name.sh
deleted file mode 100644
index e5932ab..0000000
--- a/modules/base/files/platform/solaris-name.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-seq=$(echo $1 | cut -d':' -f 1)
-controller=$(($seq / 8))
-disk=$((seq % 8))
-
-if [ -n "$2" ]; then
- echo "c${controller}t${disk}d0s$(($2 - 1))"
-else
- echo "c${controller}t${disk}d0"
-fi
diff --git a/modules/base/manifests/platform.pp
b/modules/base/manifests/platform.pp
index b1d3db6..7162da5 100644
--- a/modules/base/manifests/platform.pp
+++ b/modules/base/manifests/platform.pp
@@ -10,14 +10,6 @@
$startup_drives = [ '/dev/sda', '/dev/sdb']
include base::platform::dell-r300
}
- 'Sun Fire X4500': {
- $startup_drives = [ '/dev/sdy', '/dev/sdac' ]
- include base::platform::sun-x4500
- }
- 'Sun Fire X4540': {
- $startup_drives = [ '/dev/sda', '/dev/sdi' ]
- include base::platform::sun-x4540
- }
'R250-2480805': {
$startup_drives = [ '/dev/sda', '/dev/sdb' ]
include base::platform::cisco-C250-M1
@@ -66,18 +58,6 @@
class { 'common': lom_serial_port => $lom_serial_port, lom_serial_speed =>
$lom_serial_speed }
}
-class base::platform::sun-x4500 inherits base::platform::generic::sun {
- File <| tag == 'thumper-udev' |>
-
- class { 'common': lom_serial_port => $lom_serial_port, lom_serial_speed =>
$lom_serial_speed }
-}
-
-class base::platform::sun-x4540 inherits base::platform::generic::sun {
- File <| tag == 'thumper-udev' |>
-
- class { 'common': lom_serial_port => $lom_serial_port, lom_serial_speed =>
$lom_serial_speed }
-}
-
class base::platform::cisco-C250-M1 inherits base::platform::generic::cisco {
class { 'common': lom_serial_port => $lom_serial_port, lom_serial_speed =>
$lom_serial_speed }
}
@@ -91,33 +71,3 @@
$lom_serial_speed = '115200'
}
-class base::platform::generic::sun {
- $lom_serial_port = 'ttyS0'
- $lom_serial_speed = '9600'
-
- # Udev rules for Solaris-style disk names
- @file {
- '/etc/udev/scripts':
- ensure => directory,
- tag => 'thumper-udev';
- '/etc/udev/scripts/solaris-name.sh':
- source => 'puppet:///modules/base/platform/solaris-name.sh',
- owner => root,
- group => root,
- mode => '0555',
- tag => 'thumper-udev';
- '/etc/udev/rules.d/99-thumper-disks.rules':
- require => File['/etc/udev/scripts/solaris-name.sh'],
- source =>
'puppet:///modules/base/platform/99-thumper-disks.rules',
- owner => root,
- group => root,
- mode => '0444',
- notify => Exec['reload udev'],
- tag => 'thumper-udev';
- }
-
- exec { 'reload udev':
- command => '/sbin/udevadm control --reload-rules',
- refreshonly => true
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/109067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fdfb099b14aba2a8730cd487fd12648023f697c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
