1 From 570520c5197dd36c3e4a7956d5916426fb75856a Mon Sep 17 00:00:00 2001
2 From: Don Penney <don.penney@windriver.com>
3 Date: Tue, 7 Feb 2017 15:49:02 -0500
4 Subject: [PATCH] Newton rebase fixes
7 manifests/mon.pp | 9 ++++++---
8 manifests/osd.pp | 2 +-
9 2 files changed, 7 insertions(+), 4 deletions(-)
11 diff --git a/manifests/mon.pp b/manifests/mon.pp
12 index fa99df5..b3458d6 100644
13 --- a/manifests/mon.pp
14 +++ b/manifests/mon.pp
15 @@ -99,10 +99,13 @@ define ceph::mon (
17 # Everything else that is supported by puppet-ceph should run systemd.
22 - name => "ceph-mon@${id}",
23 - enable => $mon_enable,
24 + name => "ceph-mon-${id}",
25 + provider => $::ceph::params::service_provider,
26 + start => "service ceph start mon.${id}",
27 + stop => "service ceph stop mon.${id}",
28 + status => "service ceph status mon.${id}",
32 diff --git a/manifests/osd.pp b/manifests/osd.pp
33 index 9b8cd99..2187361 100644
34 --- a/manifests/osd.pp
35 +++ b/manifests/osd.pp
36 @@ -56,7 +56,7 @@ define ceph::osd (
38 $exec_timeout = $::ceph::params::exec_timeout,
39 $selinux_file_context = 'ceph_var_lib_t',
40 - $fsid = $::ceph::profile::params::fsid,
44 include ::ceph::params