Fix value of ctlplane fqdn fact

This fact was being retrieving the value of the hostname for the management
network. We should instead be using a value set explicitly in t-h-t.

Depends-On: Idb3ca22ac136691b0bff6f94524d133a4fa10617
Change-Id: I6fcf7c7853071a9f3377aec475308bc8d10d5b33
Related-Bug: #1621742
This commit is contained in:
Juan Antonio Osorio Robles 2016-09-09 08:40:06 +03:00
parent 4bbd4fc2c4
commit 68497915bc

View File

@ -19,26 +19,16 @@
'storage_mgmt', 'storage_mgmt',
'tenant', 'tenant',
'management', 'management',
'ctlplane',
].each do |network| ].each do |network|
Facter.add('fqdn_' + network) do Facter.add('fqdn_' + network) do
setcode do setcode do
external_hostname_parts = [ hostname_parts = [
Facter.value(:hostname), Facter.value(:hostname),
network.gsub('_', ''), network.gsub('_', ''),
Facter.value(:domain), Facter.value(:domain),
].reject { |part| part.nil? || part.empty? } ].reject { |part| part.nil? || part.empty? }
external_hostname_parts.join(".") hostname_parts.join(".")
end end
end end
end end
# map ctlplane network to management fqdn
Facter.add('fqdn_ctlplane') do
setcode do
hostname_parts = [
Facter.value(:hostname),
'management',
Facter.value(:domain),
].reject { |part| part.nil? || part.empty? }
hostname_parts.join(".")
end
end