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>
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
From 46ec08e58419bb73bf49b44cf32fa3d304236615 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Smith <kevin.smith@windriver.com>
|
|
Date: Thu, 5 Oct 2017 13:33:12 -0500
|
|
Subject: [PATCH 1/1] permit inservice update of static routes
|
|
|
|
---
|
|
.../network/lib/puppet/provider/network_route/redhat.rb | 16 ++++++++++++++--
|
|
1 file changed, 14 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/packstack/puppet/modules/network/lib/puppet/provider/network_route/redhat.rb b/packstack/puppet/modules/network/lib/puppet/provider/network_route/redhat.rb
|
|
index 7123d44..5073519 100644
|
|
--- a/packstack/puppet/modules/network/lib/puppet/provider/network_route/redhat.rb
|
|
+++ b/packstack/puppet/modules/network/lib/puppet/provider/network_route/redhat.rb
|
|
@@ -18,12 +18,18 @@ Puppet::Type.type(:network_route).provide(:redhat) do
|
|
|
|
has_feature :provider_options
|
|
|
|
+ # WRS: Generate temporary copies. It will get compared to files under
|
|
+ # /etc/sysconfig/network-scripts afterward. Only config that have changed
|
|
+ # will get replaced. Don't let puppet directly manage them, else it will
|
|
+ # trigger un-wanted networking actions (like up/down).
|
|
+ RSCRIPT_DIRECTORY = "/var/run/network-scripts.puppet"
|
|
+
|
|
def select_file
|
|
- "/etc/sysconfig/network-scripts/route-#{@resource[:interface]}"
|
|
+ "#{RSCRIPT_DIRECTORY}/route-#{@resource[:interface]}"
|
|
end
|
|
|
|
def self.target_files
|
|
- Dir["/etc/sysconfig/network-scripts/route-*"]
|
|
+ Dir["#{RSCRIPT_DIRECTORY}/route-*"]
|
|
end
|
|
|
|
def self.parse_file(filename, contents)
|
|
@@ -76,6 +82,7 @@ Puppet::Type.type(:network_route).provide(:redhat) do
|
|
|
|
# Generate an array of sections
|
|
def self.format_file(filename, providers)
|
|
+ Dir.mkdir(RSCRIPT_DIRECTORY) unless File.exists?(RSCRIPT_DIRECTORY)
|
|
contents = []
|
|
contents << header
|
|
# Build routes
|
|
@@ -103,4 +110,9 @@ Puppet::Type.type(:network_route).provide(:redhat) do
|
|
HEADER
|
|
str
|
|
end
|
|
+
|
|
+ def self.post_flush_hook(filename)
|
|
+ File.chmod(0644, filename)
|
|
+ end
|
|
+
|
|
end
|
|
--
|
|
1.8.3.1
|
|
|