Faidon Liambotis has submitted this change and it was merged. Change subject: Replace wikimedia-raid-utils by up-to-date megacli ......................................................................
Replace wikimedia-raid-utils by up-to-date megacli wikimedia-raid-utils contains an ancient version of megacli that doesn't support several of our systems (at least rdb100x & external shelves on ms100x). Instead of keeping this up-to-date, add an external apt repository to reprepro's update that has all kinds of tools packaged & install megacli out of there. Since this is one of the few binary things that we use, introduce a new non-free component in our apt and place the binaries there, as to make it clear these comew without source A cursory look didn't reveal other controllers being used across the infrastructure except megacli, so be conservative and only include that. If check-raid complains, we can always add more packages from that repo, as it seems to have packaged tools for more than wikimedia-raid-utils ever covered. Change-Id: I3279af7bbcee8906c0cbaa73a089876651de4da8 --- M files/autoinstall/scripts/early_command M files/misc/reprepro/distributions M files/misc/reprepro/updates M modules/apt/manifests/init.pp M modules/base/manifests/monitoring/host.pp M modules/base/manifests/standard-packages.pp 6 files changed, 23 insertions(+), 8 deletions(-) Approvals: ArielGlenn: Looks good to me, but someone else must approve Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/files/autoinstall/scripts/early_command b/files/autoinstall/scripts/early_command index eb6b301..7a3981e 100644 --- a/files/autoinstall/scripts/early_command +++ b/files/autoinstall/scripts/early_command @@ -16,5 +16,5 @@ # Preseed the correct wikimedia repository location SUITE=$(debconf-get mirror/suite) -echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main universe > /tmp/apt_repository.cfg +echo d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia $SUITE-wikimedia main universe non-free > /tmp/apt_repository.cfg debconf-set-selections /tmp/apt_repository.cfg diff --git a/files/misc/reprepro/distributions b/files/misc/reprepro/distributions index 35f2f71..1559a71 100644 --- a/files/misc/reprepro/distributions +++ b/files/misc/reprepro/distributions @@ -4,8 +4,9 @@ Codename: hardy-wikimedia Version: 8.04 Architectures: source amd64 -Components: main universe +Components: main universe non-free UDebComponents: main +Update: hwraid Description: Wikimedia specific packages for Ubuntu Hardy SignWith: default DebOverride: deb-override @@ -18,8 +19,9 @@ Codename: lucid-wikimedia Version: 10.04 Architectures: source amd64 -Components: main universe +Components: main universe non-free UDebComponents: main +Update: hwraid Description: Wikimedia specific packages for Ubuntu Lucid SignWith: default DebOverride: deb-override @@ -46,9 +48,9 @@ Codename: precise-wikimedia Version: 12.04 Architectures: source amd64 i386 -Components: main universe mariadb +Components: main universe non-free mariadb UDebComponents: main -Update: ceph jenkins cloudera +Update: ceph jenkins cloudera hwraid Description: Wikimedia specific packages for Ubuntu Precise SignWith: default DebOverride: deb-override diff --git a/files/misc/reprepro/updates b/files/misc/reprepro/updates index bd1845f..246eb3a 100644 --- a/files/misc/reprepro/updates +++ b/files/misc/reprepro/updates @@ -27,3 +27,13 @@ Architectures: amd64 source VerifyRelease: 327574EE02A818DD ListShellHook: grep-dctrl -e -S '^zookeeper$|^hadoop$|^hadoop-0.20-mapreduce$|^bigtop-jsvc$|^bigtop-utils$|^sqoop$|^hbase$|^pig$|^hive$|^oozie$|^hue$|^bigtop-tomcat$' || [ $? -eq 1 ] + +Name: hwraid +Method: http://hwraid.le-vert.net/ubuntu +Components: main>non-free +UDebComponents: +GetInRelease: no +Suite: precise +Architectures: amd64 source +VerifyRelease: 6005210E23B3D3B4 +ListShellHook: grep-dctrl -X -S megacli || [ $? -eq 1 ] diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp index 68da072..1b886f7 100644 --- a/modules/apt/manifests/init.pp +++ b/modules/apt/manifests/init.pp @@ -29,7 +29,7 @@ apt::repository { 'wikimedia': uri => 'http://apt.wikimedia.org/wikimedia', dist => "${::lsbdistcodename}-wikimedia", - components => 'main universe', + components => 'main universe non-free', comment_old => true, } diff --git a/modules/base/manifests/monitoring/host.pp b/modules/base/manifests/monitoring/host.pp index 3a8681c..dd4ef17 100644 --- a/modules/base/manifests/monitoring/host.pp +++ b/modules/base/manifests/monitoring/host.pp @@ -21,6 +21,10 @@ monitor_service { 'ssh': description => 'SSH', check_command => 'check_ssh', contact_group => $contact_group } if $::network_zone == 'internal' { + package { 'megacli': + ensure => 'latest', + } + file { '/usr/local/bin/check-raid.py': ensure => present, owner => root, diff --git a/modules/base/manifests/standard-packages.pp b/modules/base/manifests/standard-packages.pp index f913f47..7b9e73b 100644 --- a/modules/base/manifests/standard-packages.pp +++ b/modules/base/manifests/standard-packages.pp @@ -6,7 +6,6 @@ 'tzdata', 'zsh-beta', 'xfsprogs', - 'wikimedia-raid-utils', 'screen', 'gdb', 'iperf', @@ -26,7 +25,7 @@ ensure => latest; } - package { 'jfsutils': + package { [ 'jfsutils', 'wikimedia-raid-utils']: ensure => absent, } -- To view, visit https://gerrit.wikimedia.org/r/87558 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3279af7bbcee8906c0cbaa73a089876651de4da8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis <[email protected]> Gerrit-Reviewer: ArielGlenn <[email protected]> Gerrit-Reviewer: Faidon Liambotis <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
