Merge branch 'master' into bump-version

Jakob Kartschall · web-flow · commit 9576dfe8c344 · 2020-10-28T16:11:25.000+01:00
diff --git a/data/common.yaml b/data/common.yaml
@@ -8,5 +8,6 @@ lookup_options:
 
 promtail::bin_dir: '/usr/local/bin'
 promtail::service_ensure: 'running'
+promtail::service_enable: true
 promtail::version: 'v2.0.0'
 
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -112,6 +112,7 @@
 #
 class promtail (
   Enum['running', 'stopped']     $service_ensure,
+  Boolean                        $service_enable,
   Hash                           $clients_config_hash,
   Hash                           $positions_config_hash,
   Hash                           $scrape_configs_hash,
diff --git a/manifests/service.pp b/manifests/service.pp
@@ -13,6 +13,7 @@
 
       service { 'promtail':
         ensure  => $promtail::service_ensure,
+        enable  => $promtail::service_enable,
         require => Systemd::Unit_file['promtail.service'],
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@`
`112`	`112`	`#`
`113`	`113`	`class promtail (`
`114`	`114`	`Enum['running', 'stopped'] $service_ensure,`
	`115`	`+ Boolean $service_enable,`
`115`	`116`	`Hash $clients_config_hash,`
`116`	`117`	`Hash $positions_config_hash,`
`117`	`118`	`Hash $scrape_configs_hash,`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`service { 'promtail':`
`15`	`15`	`ensure => $promtail::service_ensure,`
	`16`	`+ enable => $promtail::service_enable,`
`16`	`17`	`require => Systemd::Unit_file['promtail.service'],`
`17`	`18`	`}`
`18`	`19`	`}`