aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-09-09 08:40:06 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-09-12 14:04:32 +0300
commit68497915bccebaa4ded0bc9e4a71d22bd5364faf (patch)
treea74a13e30f3fc1b8191b6aa7d6604ff41db7c3ac
parent4bbd4fc2c43193cc87f63fe9cac9bc60230eb507 (diff)
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
-rw-r--r--lib/facter/alt_fqdns.rb16
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