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>
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
Index: packstack/puppet/modules/network/lib/puppet/provider/network_config/redhat.rb
|
|
--- a/packstack/puppet/modules/network/lib/puppet/provider/network_config/redhat.rb
|
|
+++ b/packstack/puppet/modules/network/lib/puppet/provider/network_config/redhat.rb
|
|
@@ -224,6 +224,11 @@
|
|
|
|
pairs = self.unmunge props
|
|
|
|
+ ip_version = provider.send(:family)
|
|
+ if (ip_version.to_s == "inet6")
|
|
+ pairs = self.ipv6_fixup pairs
|
|
+ end
|
|
+
|
|
content = pairs.inject('') do |str, (key, val)|
|
|
str << %{#{key}=#{val}\n}
|
|
end
|
|
@@ -259,6 +264,30 @@
|
|
pairs
|
|
end
|
|
|
|
+ def self.ipv6_fixup(pairs)
|
|
+ pairs['IPV6INIT'] = 'yes'
|
|
+
|
|
+ if (pairs.include? 'NETMASK' and pairs.include? 'IPADDR')
|
|
+ pairs['IPV6ADDR'] = pairs['IPADDR'].to_s + "/" + pairs['NETMASK'].to_s
|
|
+ pairs.delete('NETMASK')
|
|
+ pairs.delete('IPADDR')
|
|
+ elsif (pairs.include? 'IPADDR')
|
|
+ pairs['IPV6ADDR'] = pairs['IPADDR'].to_s
|
|
+ pairs.delete('IPADDR')
|
|
+ end
|
|
+
|
|
+ if (pairs.include? 'GATEWAY')
|
|
+ pairs['IPV6_DEFAULTGW'] = pairs['GATEWAY']
|
|
+ pairs.delete('GATEWAY')
|
|
+ end
|
|
+
|
|
+ if (pairs['BOOTPROTO'].to_s == 'dhcp')
|
|
+ pairs['DHCPV6C'] = 'yes'
|
|
+ pairs['DHCLIENTARGS'] = '-1'
|
|
+ end
|
|
+ pairs
|
|
+ end
|
|
+
|
|
def self.header
|
|
str = <<-HEADER
|
|
# HEADER: This file is is being managed by puppet. Changes to
|