e7657de5ba
In the origin cinder::db::mysql, if the value of $allowed_hosts contains or equals to $host, then puppet will complain duplicate declaration error. This patch is aim to update the allowed_hosts conditonal statement in cinder::db::mysql. There are two cases to pass $allowed_hosts to $real_allowed_hosts: - If $allowed_hosts is array,then remove $host from $allowed_hosts; - elsif $allowed_hosts is string and not equivalent to $host; At last, if $real_allowed_hosts is not undef, then run cinder::db::mysql::host_access Fix bug 1206444 Change-Id: I7eb9d883c1617d9913899f32ef47a892c1d9a1a2
40 lines
1.1 KiB
Puppet
40 lines
1.1 KiB
Puppet
#
|
|
class cinder::db::mysql (
|
|
$password,
|
|
$dbname = 'cinder',
|
|
$user = 'cinder',
|
|
$host = '127.0.0.1',
|
|
$allowed_hosts = undef,
|
|
$charset = 'latin1',
|
|
$cluster_id = 'localzone'
|
|
) {
|
|
|
|
Class['cinder::db::mysql'] -> Exec<| title == 'cinder-manage db_sync' |>
|
|
Database[$dbname] ~> Exec<| title == 'cinder-manage db_sync' |>
|
|
|
|
mysql::db { $dbname:
|
|
user => $user,
|
|
password => $password,
|
|
host => $host,
|
|
charset => $charset,
|
|
require => Class['mysql::config'],
|
|
}
|
|
|
|
# Check allowed_hosts to avoid duplicate resource declarations
|
|
if is_array($allowed_hosts) and delete($allowed_hosts,$host) != [] {
|
|
$real_allowed_hosts = delete($allowed_hosts,$host)
|
|
} elsif is_string($allowed_hosts) and ($allowed_hosts != $host) {
|
|
$real_allowed_hosts = $allowed_hosts
|
|
}
|
|
|
|
if $real_allowed_hosts {
|
|
# TODO this class should be in the mysql namespace
|
|
cinder::db::mysql::host_access { $real_allowed_hosts:
|
|
user => $user,
|
|
password => $password,
|
|
database => $dbname,
|
|
}
|
|
}
|
|
|
|
}
|