d0ddf30a4c
Add debian infrastructure to build puppet-ceph as a debian packaging. Patches Dropped: 0005-Remove-puppetlabs-apt-as-ceph-requirement.patch 0004-US92424-Add-OSD-support-for-persistent-naming.patch 0006-ceph-disk-prepare-invalid-data-disk-value.patch 0008-ceph-mimic-prepare-activate-os.patch 0009-fix-ceph-osd-disk-partition-for-nvme-disks.patch Re-diffed: 0001-Roll-up-TIS-patches.patch 0002-Newton-rebase-fixes.patch 0003-ceph-jewel-rebase.patch 0004-US92424-Add-OSD-support-for-persistent-naming.patch 0005-Add-StarlingX-specific-restart-command-for-Ceph-moni.patch The patches that were dropped needs to be re-worked for ceph-volume, since ceph-disk has been deprecated and not included in the Ceph version from Debian. 0001-Roll-up-TIS-patches.patch and 0003-ceph-jewel-rebase.patch were rebased because most of the systemd logic has been dropped as well and need to be redone. Story: 2009101 Task: 43431 Signed-off-by: Charles Short <charles.short@windriver.com> Change-Id: I5a66bcd274f2752d4c050fab25a7b1b8347b650e
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
From e45ab36e8ea77500f80abd2f96cca2c6cf3a4b66 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 2/5] 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 cbf753a..eb5c125 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 7de3a53..1972caa 100644
|
|
--- a/manifests/osd.pp
|
|
+++ b/manifests/osd.pp
|
|
@@ -77,7 +77,7 @@ define ceph::osd (
|
|
$store_type = undef,
|
|
$exec_timeout = $ceph::params::exec_timeout,
|
|
$selinux_file_context = 'ceph_var_lib_t',
|
|
- $fsid = $ceph::profile::params::fsid,
|
|
+ $fsid = undef,
|
|
$dmcrypt = false,
|
|
$dmcrypt_key_dir = '/etc/ceph/dmcrypt-keys',
|
|
) {
|
|
--
|
|
2.30.2
|
|
|