Set MariaDB package name in RedHat.yaml

This moves the hard coded package name for mariadb into
the RedHat specific hieradata file. This was recently added
to controller.yaml in a1b3fa3e84.

Also, resolves an issue where RedHat.yaml wasn't actually
getting deployed. This is something that should have happened
in 5009cc6432.

Change-Id: Iaa30be3c53a7c54d31d47b997966b0106a202ea4

puppet/all-nodes-config.yaml

@@ -78,6 +78,8 @@ resources:
               - {get_param: ceph_storage_hosts}
         hiera:
           datafiles:
+            RedHat:
+              raw_data: {get_file: hieradata/RedHat.yaml}
             all_nodes:
               mapped_data:
                 controller_node_ips:

puppet/hieradata/RedHat.yaml

@@ -1,2 +1,9 @@
 # RedHat specific overrides go here
 rabbitmq::package_provider: 'yum'
+
+# The Galera package should work in cluster and
+# non-cluster modes based on the config file.
+# We set the package name here explicitly so
+# that it matches what we pre-install
+# in tripleo-puppet-elements.
+mysql::server::package_name: 'mariadb-galera-server'

puppet/hieradata/controller.yaml

@@ -92,7 +92,6 @@ horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
 
 
 mysql::server::manage_config_file: true
-mysql::server::package_name: mariadb-galera-server
 
 
 tripleo::loadbalancer::galera_master_ip: "%{hiera('bootstrap_nodeid_ip')}"