f66ba24e4e
Added packaging support for Trixie under 'debian/trixie/'. This change brings updates from the 'f/trixie' branch into 'master' to ensure consistent functionality and packaging structure across both branches. facter puppet-ceph puppet-keystone puppet-horizon puppet-openstacklib puppet-oslo puppet-boolean puppet-dnsmasq puppet-drbd puppet-etcd puppetlabs-haproxy puppetlabs-postgresql puppetlabs-stdlib puppet-hash2stuff puppet-lvm puppet-memcached puppet-network puppet-puppi puppet-rabbitmq puppet-staging puppet-vswitch puppet-zitrlp-strongswan Story: 2011360 Task: 53245 Change-Id: Id877ddc73835f0c3adeaae3a304dc5eb6f1c8274 Signed-off-by: pmp1 <preetham.mp@windriver.com> Signed-off-by: Abhinav Ayyapasetti <ayyapasetti.abhinav@windriver.com>
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
|
|
|