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>
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 8ec18087109c7612553ec33d6c87aec1c7a622d1 Mon Sep 17 00:00:00 2001
|
|
From: Al Bailey <Al.Bailey@windriver.com>
|
|
Date: Wed, 4 Oct 2017 13:04:27 -0500
|
|
Subject: [PATCH] Update getpid function
|
|
|
|
Enhance the getpid function to avoid matching with the "puppet apply" command
|
|
---
|
|
lib/puppet/provider/service/base.rb | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/puppet/provider/service/base.rb b/lib/puppet/provider/service/base.rb
|
|
index d72d408..b8ac2eb 100644
|
|
--- a/lib/puppet/provider/service/base.rb
|
|
+++ b/lib/puppet/provider/service/base.rb
|
|
@@ -31,11 +31,12 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
|
|
def getpid
|
|
@resource.fail "Either stop/status commands or a pattern must be specified" unless @resource[:pattern]
|
|
regex = Regexp.new(@resource[:pattern])
|
|
+ regex_pa = Regexp.new('puppet apply')
|
|
ps = getps
|
|
self.debug "Executing '#{ps}'"
|
|
IO.popen(ps) { |table|
|
|
table.each_line { |line|
|
|
- if regex.match(line)
|
|
+ if regex.match(line) and not regex_pa.match(line)
|
|
self.debug "Process matched: #{line}"
|
|
ary = line.sub(/^\s+/, '').split(/\s+/)
|
|
return ary[1]
|
|
--
|
|
1.8.3.1
|
|
|