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>
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
From 30ae8c86d9471980a0058823d6593e7548e19506 Mon Sep 17 00:00:00 2001
|
|
From: Don Penney <don.penney@windriver.com>
|
|
Date: Thu, 15 Jun 2017 17:34:30 -0400
|
|
Subject: [PATCH] Add disk by-path test
|
|
|
|
---
|
|
manifests/resource/up.pp | 14 +++++++++++++-
|
|
1 file changed, 13 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/manifests/resource/up.pp b/manifests/resource/up.pp
|
|
index 3e2fdac..ea379a8 100644
|
|
--- a/manifests/resource/up.pp
|
|
+++ b/manifests/resource/up.pp
|
|
@@ -8,6 +8,17 @@ define drbd::resource::up (
|
|
$mountpoint,
|
|
$automount,
|
|
) {
|
|
+
|
|
+ # Ensure disk by-path link exists
|
|
+ exec { "test disk by-path for ${name}":
|
|
+ command => "udevadm settle",
|
|
+ unless => "test -e ${disk}",
|
|
+ before => Service['drbd'],
|
|
+ require => [
|
|
+ Exec['modprobe drbd']
|
|
+ ],
|
|
+ }
|
|
+
|
|
# create metadata on device, except if resource seems already initalized.
|
|
# drbd is very tenacious about asking for aproval if there is data on the
|
|
# volume already.
|
|
@@ -18,6 +29,7 @@ define drbd::resource::up (
|
|
before => Service['drbd'],
|
|
require => [
|
|
Exec['modprobe drbd'],
|
|
+ Exec["test disk by-path for ${name}"],
|
|
Concat["/etc/drbd.d/${name}.res"],
|
|
],
|
|
notify => Service['drbd'],
|
|
@@ -35,7 +47,7 @@ define drbd::resource::up (
|
|
notify => Service['drbd'],
|
|
}
|
|
|
|
- exec { "reuse existing DRBD resoure ${name}":
|
|
+ exec { "reuse existing DRBD resource ${name}":
|
|
command => "drbdadm adjust ${name}",
|
|
onlyif => "test -e ${disk} && (drbdadm show-gi ${name} | grep 'meta-data: need apply-al')",
|
|
before => Service['drbd'],
|
|
--
|
|
1.8.3.1
|
|
|