From 4823356167956f8b72aa1c19bbfc0c5b203137bc Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Wed, 14 May 2014 16:30:30 +0300 Subject: [PATCH] clarified: Analyzer is 64 bit only, remove 32 bit support --- clarified/manifests/init.pp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/clarified/manifests/init.pp b/clarified/manifests/init.pp index e5c7e7e..28b5094 100644 --- a/clarified/manifests/init.pp +++ b/clarified/manifests/init.pp @@ -2,9 +2,7 @@ # class clarified::analyzer { - include ia32libs - - if !$clarified_analyzer_package { + if ! $clarified_analyzer_package { if $clarified_analyzer_package_latest { $clarified_analyzer_package = $clarified_analyzer_package_latest } else { @@ -12,22 +10,22 @@ class clarified::analyzer { } } - file { "/usr/local/src/clarified-analyzer-linux-i686.sh": + file { "/usr/local/src/clarified-analyzer-linux.sh": ensure => present, mode => "0755", owner => "root", group => "root", source => "puppet:///files/packages/${clarified_analyzer_package}", - before => Exec["/usr/local/src/clarified-analyzer-linux-i686.sh"], + before => Exec["/usr/local/src/clarified-analyzer-linux.sh"], } exec { "rm -f /usr/local/clarified-analyzer": path => "/bin:/usr/bin:/sbin:/usr/sbin", onlyif => "test -h /usr/local/clarified-analyzer", - subscribe => File["/usr/local/src/clarified-analyzer-linux-i686.sh"], - before => Exec["/usr/local/src/clarified-analyzer-linux-i686.sh"], + subscribe => File["/usr/local/src/clarified-analyzer-linux.sh"], + before => Exec["/usr/local/src/clarified-analyzer-linux.sh"], refreshonly => true, } - exec { "/usr/local/src/clarified-analyzer-linux-i686.sh": + exec { "/usr/local/src/clarified-analyzer-linux.sh": creates => "/usr/local/clarified-analyzer", } @@ -38,7 +36,7 @@ class clarified::analyzer { # class clarified::recorder { - if !$clarified_recorder_package { + if ! $clarified_recorder_package { if $clarified_recorder_package_latest { $clarified_recorder_package = $clarified_recorder_package_latest } else {