bac46cc0e0
This work is part of Debian integration effort. This work only affects debian. We package the same version of ceph for both CentOS and Debian. Since we know the puppet-ceph module on CentOS is supposed to work, use this on Debian also to reduce testing and possible issues. Patches were copied from CentOS and not touched. Drop one patch to metadata.json, we know we have some work to do in that area to clear puppet warnings, but will be done part of a generic clearing puppet warnings effort. The sources need to be patched to work with debhelper-compat 13, which we don't care now. There are some integration issues, but testing so far revealed that during a puppet replay for aio manifest ceph data and ceph journal partitions were created. Story: 2009101 Task: 43431 Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com> Change-Id: I90adc736ea52e6c4f9946520156f53e572c224cc
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From 570520c5197dd36c3e4a7956d5916426fb75856a Mon Sep 17 00:00:00 2001
|
|
From: Don Penney <don.penney@windriver.com>
|
|
Date: Tue, 7 Feb 2017 15:49:02 -0500
|
|
Subject: [PATCH] Newton rebase fixes
|
|
|
|
---
|
|
manifests/mon.pp | 9 ++++++---
|
|
manifests/osd.pp | 2 +-
|
|
2 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/manifests/mon.pp b/manifests/mon.pp
|
|
index fa99df5..b3458d6 100644
|
|
--- a/manifests/mon.pp
|
|
+++ b/manifests/mon.pp
|
|
@@ -99,10 +99,13 @@ define ceph::mon (
|
|
}
|
|
# Everything else that is supported by puppet-ceph should run systemd.
|
|
} else {
|
|
- $init = 'systemd'
|
|
+ $init = 'sysvinit'
|
|
Service {
|
|
- name => "ceph-mon@${id}",
|
|
- enable => $mon_enable,
|
|
+ name => "ceph-mon-${id}",
|
|
+ provider => $::ceph::params::service_provider,
|
|
+ start => "service ceph start mon.${id}",
|
|
+ stop => "service ceph stop mon.${id}",
|
|
+ status => "service ceph status mon.${id}",
|
|
}
|
|
}
|
|
|
|
diff --git a/manifests/osd.pp b/manifests/osd.pp
|
|
index 9b8cd99..2187361 100644
|
|
--- a/manifests/osd.pp
|
|
+++ b/manifests/osd.pp
|
|
@@ -56,7 +56,7 @@ define ceph::osd (
|
|
$uuid = undef,
|
|
$exec_timeout = $::ceph::params::exec_timeout,
|
|
$selinux_file_context = 'ceph_var_lib_t',
|
|
- $fsid = $::ceph::profile::params::fsid,
|
|
+ $fsid = undef,
|
|
) {
|
|
|
|
include ::ceph::params
|
|
--
|
|
2.7.4
|
|
|