2 files changed, 40 insertions, 4 deletions
diff --git a/lib/facter/galera_bootstrapped.rb b/lib/facter/alt_fqdns.rb
index ea9fe8c..24d6ef1 100644
--- a/lib/facter/galera_bootstrapped.rb
+++ b/lib/facter/alt_fqdns.rb
@@ -1,4 +1,4 @@
-# Copyright 2015 Red Hat, Inc.
+# Copyright 2016 Red Hat, Inc.
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -12,8 +12,22 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-Facter.add('galera_bootstrapped') do
-  setcode do
-    FileTest.exists?('/var/lib/mysql/grastate.dat')
+[
+  'external',
+  'internalapi',
+  'storage',
+  'storagemgmt',
+  'tenant',
+  'management',
+].each do |network|
+  Facter.add('fqdn_' + network) do
+    setcode do
+      external_hostname_parts = [
+        Facter.value(:hostname),
+        network,
+        Facter.value(:domain),
+      ].reject { |part| part.empty? }
+      external_hostname_parts.join(".")
+    end
   end
 end
diff --git a/lib/puppet/parser/functions/lookup_hiera_hash.rb b/lib/puppet/parser/functions/lookup_hiera_hash.rb
new file mode 100644
index 0000000..d96d65f
--- /dev/null
+++ b/lib/puppet/parser/functions/lookup_hiera_hash.rb
@@ -0,0 +1,22 @@
+module Puppet::Parser::Functions
+  newfunction(:lookup_hiera_hash, :arity => 2, :type => :rvalue,
+              :doc => "Lookup a key->value from a Hiera hash") do |args|
+    hash_name = args[0]
+    key_name = args[1]
+    unless hash_name.is_a?(String) and key_name.is_a?(String)
+      raise Puppet::ParseError, "The hash name and the key name must be given as strings."
+    end
+    if defined? call_function
+      hash = call_function('hiera', [hash_name])
+    else
+      hash = function_hiera([hash_name])
+    end
+    unless hash.is_a?(Hash)
+      raise Puppet::ParseError, "The value Hiera returned for #{hash_name} is not a Hash."
+    end
+    unless hash.key?(key_name)
+      raise Puppet::ParseError, "The Hiera hash #{hash_name} does not contain key #{key_name}."
+    end
+    return hash[key_name]
+  end
+end