diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-01 01:20:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-01 01:20:52 +0000 |
| commit | f0474c10b9a76d780acbd0629217e9cc69f383c0 (patch) | |
| tree | caf4428f4036f0ddbf5b8d652185bd92fc3c179a /manifests/profile/base | |
| parent | 4f288f3f30718ab2778e8cce0b0d1e6530f7b625 (diff) | |
| parent | 0c00789351a64f9416a9ca6eb68432a445083c9d (diff) | |
Merge "mysqlclient: Drop hiera calls in favor of getting these via t-h-t"
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/database/mysql/client.pp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/manifests/profile/base/database/mysql/client.pp b/manifests/profile/base/database/mysql/client.pp index a58b7ad..22384a9 100644 --- a/manifests/profile/base/database/mysql/client.pp +++ b/manifests/profile/base/database/mysql/client.pp @@ -25,15 +25,15 @@ # # [*mysql_read_default_file*] # (Optional) Name of the file that will be passed to pymysql connection strings -# Defaults to hiera('tripleo::profile::base:database::mysql::read_default_file', '/etc/my.cnf.d/tripleo.cnf') +# Defaults to '/etc/my.cnf.d/tripleo.cnf' # # [*mysql_read_default_group*] # (Optional) Name of the ini section to be passed to pymysql connection strings -# Defaults to hiera('tripleo::profile::base:database::mysql::read_default_group', 'tripleo') +# Defaults to 'tripleo' # # [*mysql_client_bind_address*] # (Optional) Client IP address of the host that will be written in the mysql_read_default_file -# Defaults to hiera('tripleo::profile::base:database::mysql::client_bind_address', undef) +# Defaults to undef # # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates @@ -42,9 +42,9 @@ # class tripleo::profile::base::database::mysql::client ( $enable_ssl = false, - $mysql_read_default_file = hiera('tripleo::profile::base:database::mysql::read_default_file', '/etc/my.cnf.d/tripleo.cnf'), - $mysql_read_default_group = hiera('tripleo::profile::base:database::mysql::read_default_group', 'tripleo'), - $mysql_client_bind_address = hiera('tripleo::profile::base:database::mysql::client_bind_address', undef), + $mysql_read_default_file = '/etc/my.cnf.d/tripleo.cnf', + $mysql_read_default_group = 'tripleo', + $mysql_client_bind_address = undef, $step = hiera('step'), ) { if $step >= 1 { @@ -79,11 +79,11 @@ class tripleo::profile::base::database::mysql::client ( $conf_changes = union($client_bind_changes, $changes_ssl) + # Create /etc/my.cnf.d/tripleo.cnf exec { 'directory-create-etc-my.cnf.d': command => 'mkdir -p /etc/my.cnf.d', path => ['/usr/bin', '/usr/sbin', '/bin', '/sbin'], } -> - # Create /etc/my.cnf.d/tripleo.cnf with the [tripleo]bind-address=<IP of the node in the mysql network> augeas { 'tripleo-mysql-client-conf': incl => $mysql_read_default_file, lens => 'Puppet.lns', |