Commit 79b6c247 authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review

Merge "fix the service names"

parents 18e5af8f 7f21b323
......@@ -88,8 +88,8 @@ define ceph::mon (
if $::service_provider == 'upstart' {
$init = 'upstart'
Service {
name => "ceph-mon-${id}",
provider => $::ceph::params::service_provider,
name => 'ceph-mon',
provider => $::service_provider,
start => "start ceph-mon id=${id}",
stop => "stop ceph-mon id=${id}",
status => "status ceph-mon id=${id}",
......@@ -226,7 +226,7 @@ test ! -e ${keyring_path}
} elsif $ensure == absent {
service { $mon_service:
ensure => stopped
ensure => stopped,
}
-> exec { "remove-mon-${id}":
command => "/bin/true # comment to satisfy puppet syntax requirements
......
......@@ -55,7 +55,6 @@ class ceph::params (
$user_radosgw = 'www-data'
$pkg_fastcgi = 'libapache2-mod-fastcgi'
$pkg_nsstools = ['libnss3-tools', 'wget']
$service_provider = 'debian'
$pkg_policycoreutils = 'policycoreutils'
}
......@@ -64,7 +63,6 @@ class ceph::params (
$user_radosgw = 'apache'
$pkg_fastcgi = 'mod_fastcgi'
$pkg_nsstools = ['nss-tools', 'wget']
$service_provider = 'systemd'
$pkg_policycoreutils = 'policycoreutils-python'
}
......
......@@ -178,11 +178,11 @@ define ceph::rgw (
}
Service {
name => "radosgw-${name}",
name => 'radosgw',
start => "start radosgw id=${name}",
stop => "stop radosgw id=${name}",
status => "status radosgw id=${name}",
provider => $::ceph::params::service_provider,
provider => $::service_provider,
}
# Everything else that is supported by puppet-ceph should run systemd.
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment