aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/pacemaker/database
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-10-10 21:09:01 -0400
committerDan Prince <dprince@redhat.com>2016-11-30 22:16:13 -0500
commit787685101179f13f6074901070cf307bd9bb0731 (patch)
treea123fe8baca66ce99c2433f19bb120546e8a6c3a /puppet/services/pacemaker/database
parent9cd0c5a50c45bfce9dabc64aafa3188ba9bdd13c (diff)
Hiera optimization: use a new hiera hook
This patch optimizes how we deploy hiera by using a new heat hook specifically designed to help compose hiera within heat templates. As part of this change: - we update all the 'hiera' software configurations to set the group to hiera instead of os-apply-config. - The new format uses JSON instead of YAML. The hook actually writes out the hiera JSON directly so no conversion takes place. Arrays, Strings, Booleans all stay in their native formats. As such we can avoid having to do many of the awkward string and list conversions in t-h-t to support the previous YAML formatting. - The new hook prefers JSON over YAML so upgrading users will have the new files prefered. (we will post a cleanup routine for the old files soon but this isn't a new behavior, JSON is now simply prefered.) - A lot of services required edits to account for default settings that worked in YAML that no longer work correctly in the native JSON format. In almost all these cases I think the resulting codes looks cleaner and is more explicit with regards to what is getting configured in hiera on the actual nodes. Depends-On: I6a383b1ad4ec29458569763bd3f56fd3f2bd726b Closes-bug: #1596373 Change-Id: Ibe7e2044e200e2c947223286fdf4fd5bcf98c2e1
Diffstat (limited to 'puppet/services/pacemaker/database')
-rw-r--r--puppet/services/pacemaker/database/mysql.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/pacemaker/database/mysql.yaml b/puppet/services/pacemaker/database/mysql.yaml
index 7deaf0ca..ea3d8abd 100644
--- a/puppet/services/pacemaker/database/mysql.yaml
+++ b/puppet/services/pacemaker/database/mysql.yaml
@@ -40,7 +40,7 @@ outputs:
- tripleo::profile::pacemaker::database::mysql::bind_address:
str_replace:
template:
- '"%{::fqdn_$NETWORK}"'
+ '%{::fqdn_$NETWORK}'
params:
$NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]}
# NOTE: bind IP is found in Heat replacing the network name with the