diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp index 3ffb3f6..8b9d7b3 100644 --- a/manifests/main/dirs.pp +++ b/manifests/main/dirs.pp @@ -46,18 +46,5 @@ class confdroid_prometheus::main::dirs ( ensure => absent, } } - # binary install directory - if $install_from_binary == true { - file { $ps_install_dir: - ensure => directory, - owner => 'root', - group => 'root', - mode => '0755', - selrange => s0, - selrole => object_r, - seltype => usr_, - seluser => unconfined_u, - } - } } } diff --git a/manifests/main/install.pp b/manifests/main/install.pp index fb6a8c9..49af78a 100644 --- a/manifests/main/install.pp +++ b/manifests/main/install.pp @@ -7,16 +7,10 @@ class confdroid_prometheus::main::install ( ) inherits confdroid_prometheus::params { require confdroid_prometheus::main::yumrepo if $manage_prometheus == true { - if $install_from_binary == false { - package { $reqpackage_prom: - ensure => $pkg_ensure, - } - } - if $install_from_binary == true { - # place function here to install from binary releases, e.g. using the archive module + package { $reqpackage_prom: + ensure => $pkg_ensure, } } - if $manage_node_exporter == true { package { $reqpackage_ne: ensure => $pkg_ensure, diff --git a/manifests/params.pp b/manifests/params.pp index 0ccdbd6..0215aaf 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -41,8 +41,6 @@ # @param [String] ps_min_age_hours Minimum block age in hours before pruning # @param [String] ps_grace_hours Grace period in hours to be extra safe # @param [String] ps_sql_template the SQL template to use for checks. -# @param [Boolean] install_from_binary whether to install from binary releases -# instead of packages ############################################################################## class confdroid_prometheus::params ( @@ -50,7 +48,6 @@ class confdroid_prometheus::params ( String $reqpackage_prom = 'prometheus2', String $reqpackage_ne = 'node_exporter', String $pkg_ensure = 'present', - Boolean $install_from_binary = false, # config logic Boolean $manage_prometheus = false,