diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-06-24 13:19:55 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-06-24 13:19:55 -0400 |
| commit | 85901b37df03459d83e963b842537f26d26460d5 (patch) | |
| tree | e495b9144001bcddea102a2a72f4cb32e2a8ab9b | |
| parent | 7852f5da56a0a1d7b4ce2bf6f46d70700ffeea82 (diff) | |
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 a1b3fa3e84185b6969a8acfda475fe7fc48bd5a1.
Also, resolves an issue where RedHat.yaml wasn't actually
getting deployed. This is something that should have happened
in 5009cc64322e9fb5723799eb9fbd79076a2dc5da.
Change-Id: Iaa30be3c53a7c54d31d47b997966b0106a202ea4
| -rw-r--r-- | puppet/all-nodes-config.yaml | 2 | ||||
| -rw-r--r-- | puppet/hieradata/RedHat.yaml | 7 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index c50d6820..060f4c81 100644 --- a/puppet/all-nodes-config.yaml +++ b/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: diff --git a/puppet/hieradata/RedHat.yaml b/puppet/hieradata/RedHat.yaml index f42c7159..25902828 100644 --- a/puppet/hieradata/RedHat.yaml +++ b/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' diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index d0cbe890..2e30f211 100644 --- a/puppet/hieradata/controller.yaml +++ b/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')}" |