Changeset View
Changeset View
Standalone View
Standalone View
site-modules/profile/lib/facter/swh_hostname.rb
require 'puppet' | require 'puppet' | ||||
require 'socket' | require 'socket' | ||||
domain_name = ".internal.softwareheritage.org" | domain_names = [ | ||||
ardumont: probably missing a "," | |||||
Done Inline Actionsyes, fixed in rSPSITEe2742a2125d8d98960c14f8bdea03839b117a84f ardumont: yes, fixed in rSPSITEe2742a2125d8d98960c14f8bdea03839b117a84f | |||||
".internal.softwareheritage.org" | |||||
".internal.staging.swh.network" | |||||
] | |||||
default_domain_name = domain_names[0] | |||||
Facter.add(:swh_hostname) do | Facter.add(:swh_hostname) do | ||||
setcode do | setcode do | ||||
retval = {} | retval = {} | ||||
retval["fqdn"] = Facter.value(:fqdn).to_s | retval["fqdn"] = Facter.value(:fqdn).to_s | ||||
if retval["fqdn"].end_with?(domain_name) | domain_names.each do |domain| | ||||
retval["short"] = retval["fqdn"].chomp(domain_name) | if retval["fqdn"].end_with?(domain) | ||||
retval["short"] = retval["fqdn"].chomp(domain) | |||||
retval["internal_fqdn"] = retval["fqdn"] | retval["internal_fqdn"] = retval["fqdn"] | ||||
else | return retval | ||||
ardumontAuthorUnsubmitted Done Inline ActionsThat does not what i expected. ardumont: That does not what i expected.
This needs to be fixed (working on it) | |||||
retval["short"] = Socket.gethostname | end | ||||
retval["internal_fqdn"] = retval["short"] + domain_name | |||||
end | end | ||||
# fallback | |||||
retval["short"] = Socket.gethostname | |||||
retval["internal_fqdn"] = retval["short"] + default_domain_name | |||||
retval | retval | ||||
end | end | ||||
end | end |
probably missing a ","