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
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
---
|
|
facter-2.4.4/lib/facter/domain.rb | 24 +++++++++++++-----------
|
|
facter-2.4.4/lib/facter/uniqueid.rb | 9 +++++----
|
|
2 files changed, 18 insertions(+), 15 deletions(-)
|
|
|
|
--- a/facter-2.4.4/lib/facter/domain.rb
|
|
+++ b/facter-2.4.4/lib/facter/domain.rb
|
|
@@ -33,22 +33,24 @@ Facter.add(:domain) do
|
|
full_hostname = 'hostname -f 2> /dev/null'
|
|
can_do_hostname_f = Regexp.union /Linux/i, /FreeBSD/i, /Darwin/i
|
|
|
|
- hostname_command = if Facter.value(:kernel) =~ can_do_hostname_f
|
|
- full_hostname
|
|
- elsif Facter.value(:kernel) == "windows"
|
|
- windows_hostname
|
|
- else
|
|
- basic_hostname
|
|
- end
|
|
+ # Because hostname -f doesn't work for IPv6, don't use that flag
|
|
+ # hostname_command = if Facter.value(:kernel) =~ can_do_hostname_f
|
|
+ # full_hostname
|
|
+ # elsif Facter.value(:kernel) == "windows"
|
|
+ # windows_hostname
|
|
+ # else
|
|
+ # basic_hostname
|
|
+ # end
|
|
+ hostname_command = basic_hostname
|
|
|
|
if name = Facter::Core::Execution.exec(hostname_command) \
|
|
and name =~ /.*?\.(.+$)/
|
|
|
|
return_value = $1
|
|
- elsif Facter.value(:kernel) != "windows" and domain = Facter::Core::Execution.exec('dnsdomainname 2> /dev/null') \
|
|
- and domain =~ /.+/
|
|
-
|
|
- return_value = domain
|
|
+ # elsif Facter.value(:kernel) != "windows" and domain = Facter::Core::Execution.exec('dnsdomainname 2> /dev/null') \
|
|
+ # and domain =~ /.+/
|
|
+ #
|
|
+ # return_value = domain
|
|
elsif FileTest.exists?("/etc/resolv.conf")
|
|
domain = nil
|
|
search = nil
|
|
--- a/facter-2.4.4/lib/facter/uniqueid.rb
|
|
+++ b/facter-2.4.4/lib/facter/uniqueid.rb
|
|
@@ -1,4 +1,5 @@
|
|
-Facter.add(:uniqueid) do
|
|
- setcode 'hostid'
|
|
- confine :kernel => %w{SunOS Linux AIX GNU/kFreeBSD}
|
|
-end
|
|
+# hostid does not work with IPv6, and is not needed for Titanium cloud, so remove
|
|
+# Facter.add(:uniqueid) do
|
|
+# setcode 'hostid'
|
|
+# confine :kernel => %w{SunOS Linux AIX GNU/kFreeBSD}
|
|
+# end
|