diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-09-12 17:27:13 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-09-12 17:27:14 +0000 |
commit | 2021ba60ffefa1a809e964fac59ef64a19d49a90 (patch) | |
tree | 0e59abfc78c35261b8dd2e4bb4cc833a2c88ea04 | |
parent | cbd84e7e52d5751f74bebbff866c784809df6bde (diff) | |
parent | 68497915bccebaa4ded0bc9e4a71d22bd5364faf (diff) |
Merge "Fix value of ctlplane fqdn fact"
-rw-r--r-- | lib/facter/alt_fqdns.rb | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/facter/alt_fqdns.rb b/lib/facter/alt_fqdns.rb index 216beef..2d78b9a 100644 --- a/lib/facter/alt_fqdns.rb +++ b/lib/facter/alt_fqdns.rb @@ -19,26 +19,16 @@ 'storage_mgmt', 'tenant', 'management', + 'ctlplane', ].each do |network| Facter.add('fqdn_' + network) do setcode do - external_hostname_parts = [ + hostname_parts = [ Facter.value(:hostname), network.gsub('_', ''), Facter.value(:domain), ].reject { |part| part.nil? || part.empty? } - external_hostname_parts.join(".") + hostname_parts.join(".") 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 |