diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-26 13:53:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-26 13:53:42 +0000 |
| commit | 546683fdc91c5f3269d69b781cd667a4ed21a163 (patch) | |
| tree | 0957209a22273a39ecd6c3c803ddafeb0208ee0b | |
| parent | 9393a3e2a57d293eabe1fcfb702b0cecdf5e60ff (diff) | |
| parent | a387c110a6ffbedb1a62f218be1ce2c0636b5b38 (diff) | |
Merge "Bind MySQL address to hostname appropriate to its network"
| -rw-r--r-- | puppet/services/database/mysql.yaml | 6 | ||||
| -rw-r--r-- | puppet/services/pacemaker/database/mysql.yaml | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/puppet/services/database/mysql.yaml b/puppet/services/database/mysql.yaml index b0eea481..094a7c9f 100644 --- a/puppet/services/database/mysql.yaml +++ b/puppet/services/database/mysql.yaml @@ -74,5 +74,11 @@ outputs: # internal_api_uri -> [IP] # internal_api_subnet - > IP/CIDR mysql_bind_host: {get_param: [ServiceNetMap, MysqlNetwork]} + tripleo::profile::base::database::mysql::bind_address: + str_replace: + template: + '"%{::fqdn_$NETWORK}"' + params: + $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]} step_config: | include ::tripleo::profile::base::database::mysql diff --git a/puppet/services/pacemaker/database/mysql.yaml b/puppet/services/pacemaker/database/mysql.yaml index d555ed0a..f6d4be20 100644 --- a/puppet/services/pacemaker/database/mysql.yaml +++ b/puppet/services/pacemaker/database/mysql.yaml @@ -35,6 +35,13 @@ outputs: value: service_name: mysql config_settings: - get_attr: [MysqlBase, role_data, config_settings] + map_merge: + - get_attr: [MysqlBase, role_data, config_settings] + - tripleo::profile::pacemaker::database::mysql::bind_address: + str_replace: + template: + '"%{::fqdn_$NETWORK}"' + params: + $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]} step_config: | include ::tripleo::profile::pacemaker::database::mysql |