remove puppet_metrics_dashboard::telegraf::install class

suckatrash · suckatrash · commit ebf644dada40 · 2019-07-08T13:56:49.000-07:00
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -23,7 +23,6 @@
 * `puppet_metrics_dashboard::service`: Manages services
 * `puppet_metrics_dashboard::telegraf`: Install and configure Telegraf
 * `puppet_metrics_dashboard::telegraf::config`: Configures Telegraf
-* `puppet_metrics_dashboard::telegraf::install`: Installs Telegraf
 * `puppet_metrics_dashboard::telegraf::service`: Manages the Telegraf service
 
 ## Defined types
diff --git a/manifests/telegraf.pp b/manifests/telegraf.pp
@@ -11,12 +11,10 @@
   }
 
   if $_enable_telegraf {
-    contain puppet_metrics_dashboard::telegraf::install
     contain puppet_metrics_dashboard::telegraf::config
     contain puppet_metrics_dashboard::telegraf::service
 
-    Class['puppet_metrics_dashboard::telegraf::install']
-    -> Class['puppet_metrics_dashboard::telegraf::config']
+    Class['puppet_metrics_dashboard::telegraf::config']
     -> Class['puppet_metrics_dashboard::telegraf::service']
   }
 }
diff --git a/manifests/telegraf/install.pp b/manifests/telegraf/install.pp
diff --git a/manifests/telegraf/service.pp b/manifests/telegraf/service.pp
@@ -8,7 +8,6 @@
     ensure  => running,
     enable  => true,
     require => [
-      Package['telegraf'],
       Service[$puppet_metrics_dashboard::influx_db_service_name]],
   }
 }
diff --git a/spec/classes/telegraf/install_spec.rb b/spec/classes/telegraf/install_spec.rb
diff --git a/spec/classes/telegraf_spec.rb b/spec/classes/telegraf_spec.rb
@@ -18,7 +18,6 @@
           PRE_COND
         end
 
-        it { is_expected.to contain_class('puppet_metrics_dashboard::telegraf::install') }
         it { is_expected.to contain_class('puppet_metrics_dashboard::telegraf::config') }
         it { is_expected.to contain_class('puppet_metrics_dashboard::telegraf::service') }
       end
@@ -33,7 +32,6 @@ class {'puppet_metrics_dashboard':
           PRE_COND
         end
 
-        it { is_expected.not_to contain_class('puppet_metrics_dashboard::telegraf::install') }
         it { is_expected.not_to contain_class('puppet_metrics_dashboard::telegraf::config') }
         it { is_expected.not_to contain_class('puppet_metrics_dashboard::telegraf::service') }
       end

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,10 @@`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`if $_enable_telegraf {`
`14`		`- contain puppet_metrics_dashboard::telegraf::install`
`15`	`14`	`contain puppet_metrics_dashboard::telegraf::config`
`16`	`15`	`contain puppet_metrics_dashboard::telegraf::service`
`17`	`16`
`18`		`- Class['puppet_metrics_dashboard::telegraf::install']`
`19`		`- -> Class['puppet_metrics_dashboard::telegraf::config']`
	`17`	`+ Class['puppet_metrics_dashboard::telegraf::config']`
`20`	`18`	`-> Class['puppet_metrics_dashboard::telegraf::service']`
`21`	`19`	`}`
`22`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`ensure => running,`
`9`	`9`	`enable => true,`
`10`	`10`	`require => [`
`11`		`- Package['telegraf'],`
`12`	`11`	`Service[$puppet_metrics_dashboard::influx_db_service_name]],`
`13`	`12`	`}`
`14`	`13`	`}`