diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-01 13:01:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-01 13:01:14 +0000 |
| commit | ea3ace78398015578de77be5a782dfa6176decb7 (patch) | |
| tree | 9806ff6109463e8c5bcfcefe26052cf5a6fd85da /puppet/services/database | |
| parent | 096259f7140ec8476fcbb7605c90155079b0c6bc (diff) | |
| parent | 787685101179f13f6074901070cf307bd9bb0731 (diff) | |
Merge "Hiera optimization: use a new hiera hook"
Diffstat (limited to 'puppet/services/database')
| -rw-r--r-- | puppet/services/database/mysql.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/database/redis-base.yaml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/puppet/services/database/mysql.yaml b/puppet/services/database/mysql.yaml index 651bf4b1..bed8f7d3 100644 --- a/puppet/services/database/mysql.yaml +++ b/puppet/services/database/mysql.yaml @@ -87,7 +87,7 @@ outputs: tripleo::profile::base::database::mysql::bind_address: str_replace: template: - '"%{::fqdn_$NETWORK}"' + '%{::fqdn_$NETWORK}' params: $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]} step_config: | diff --git a/puppet/services/database/redis-base.yaml b/puppet/services/database/redis-base.yaml index 4ed3c007..2fab0eb6 100644 --- a/puppet/services/database/redis-base.yaml +++ b/puppet/services/database/redis-base.yaml @@ -39,6 +39,6 @@ outputs: # internal_api_subnet - > IP/CIDR redis::bind: {get_param: [ServiceNetMap, RedisNetwork]} redis::port: 6379 - redis::sentinel::master_name: '"%{hiera(\"bootstrap_nodeid\")}"' - redis::sentinel::redis_host: '"%{hiera(\"bootstrap_nodeid_ip\")}"' + redis::sentinel::master_name: "%{hiera('bootstrap_nodeid')}" + redis::sentinel::redis_host: "%{hiera('bootstrap_nodeid_ip')}" redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh' |