diff --git a/manifests/service.pp b/manifests/service.pp index 6cf9cf0..03d3456 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -1,48 +1,48 @@ # == Class grafana::service # # This class is meant to be called from grafana # It ensure the service is running # class grafana::service { case $grafana::install_method { 'docker': { $container = { 'grafana' => $grafana::container_params, } $defaults = { - image => "${grafana::params::docker_image}:${grafana::version}", - ports => $grafana::params::docker_ports, + image => "${grafana::docker_image}:${grafana::version}", + ports => $grafana::docker_ports, } create_resources(docker::run, $container, $defaults) } 'package','repo': { service { 'grafana': ensure => running, name => $grafana::service_name, enable => true, subscribe => Package['grafana'], } } 'archive': { $service_path = "${grafana::install_dir}/bin/${grafana::service_name}" $service_config = "${grafana::install_dir}/conf/custom.ini" if !defined(Service['grafana']){ service { 'grafana': ensure => running, name => $grafana::service_name, provider => base, binary => "su - grafana -c '${service_path} -config=${service_config} -homepath=${grafana::install_dir} web &'", hasrestart => false, hasstatus => false, status => "ps -ef | grep ${grafana::service_name} | grep -v grep", } } } default: { fail("Installation method ${grafana::install_method} not supported") } } }