bab9bb6b69
Create new directories:
ceph
config
config-files
filesystem
kernel
kernel/kernel-modules
ldap
logging
strorage-drivers
tools
utilities
virt
Retire directories:
connectivity
core
devtools
support
extended
Delete two packages:
tgt
irqbalance
Relocated packages:
base/
dhcp
initscripts
libevent
lighttpd
linuxptp
memcached
net-snmp
novnc
ntp
openssh
pam
procps
sanlock
shadow
sudo
systemd
util-linux
vim
watchdog
ceph/
python-cephclient
config/
facter
puppet-4.8.2
puppet-modules
filesystem/
e2fsprogs
nfs-utils
nfscheck
kernel/
kernel-std
kernel-rt
kernel/kernel-modules/
mlnx-ofa_kernel
ldap/
nss-pam-ldapd
openldap
logging/
syslog-ng
logrotate
networking/
lldpd
iproute
mellanox
python-ryu
mlx4-config
python/
python-2.7.5
python-django
python-gunicorn
python-setuptools
python-smartpm
python-voluptuous
security/
shim-signed
shim-unsigned
tboot
strorage-drivers/
python-3parclient
python-lefthandclient
virt/
cloud-init
libvirt
libvirt-python
qemu
tools/
storage-topology
vm-topology
utilities/
tis-extensions
namespace-utils
nova-utils
update-motd
Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From 89e1781309a8415d65c50c13c18742a92c970362 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 54f9909..41fd8df 100644
|
|
--- a/manifests/mon.pp
|
|
+++ b/manifests/mon.pp
|
|
@@ -100,10 +100,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 5d3628d..ef171eb 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,
|
|
) {
|
|
|
|
$data = $name
|
|
--
|
|
1.8.3.1
|
|
|