Move mysql code to db::mysql
This commit moves the mysql specific db manifests to the namespace glance::db::mysql. This is done for two reasons: - to create a directory loaction for manifests for all future supported datbases - to be consistent with other openstack projects
This commit is contained in:
parent
827b302824
commit
52aae65a4c
|
@ -40,7 +40,7 @@ node glance_keystone_mysql {
|
||||||
log_debug => true,
|
log_debug => true,
|
||||||
catalog_type => 'sql',
|
catalog_type => 'sql',
|
||||||
}->
|
}->
|
||||||
class { 'keystone::mysql':
|
class { 'keystone::db::mysql':
|
||||||
password => 'keystone',
|
password => 'keystone',
|
||||||
}->
|
}->
|
||||||
class { 'keystone::roles::admin': }
|
class { 'keystone::roles::admin': }
|
||||||
|
@ -90,7 +90,7 @@ class role_glance_mysql {
|
||||||
}
|
}
|
||||||
class { 'glance::backend::file': }
|
class { 'glance::backend::file': }
|
||||||
|
|
||||||
class { 'glance::db':
|
class { 'glance::db::mysql':
|
||||||
password => 'glance',
|
password => 'glance',
|
||||||
dbname => 'glance',
|
dbname => 'glance',
|
||||||
user => 'glance',
|
user => 'glance',
|
||||||
|
|
|
@ -11,10 +11,12 @@ define glance::api::config(
|
||||||
$content = template("glance/api/${name}.erb"),
|
$content = template("glance/api/${name}.erb"),
|
||||||
$order = undef
|
$order = undef
|
||||||
) {
|
) {
|
||||||
|
|
||||||
concat::fragment { "glance-api-${name}":
|
concat::fragment { "glance-api-${name}":
|
||||||
target => '/etc/glance/glance-api.conf',
|
target => '/etc/glance/glance-api.conf',
|
||||||
content => $content,
|
content => $content,
|
||||||
order => $order,
|
order => $order,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# I should change this to mysql
|
# I should change this to mysql
|
||||||
# for consistency
|
# for consistency
|
||||||
#
|
#
|
||||||
class glance::db(
|
class glance::db::mysql(
|
||||||
$password,
|
$password,
|
||||||
$dbname = 'glance',
|
$dbname = 'glance',
|
||||||
$user = 'glance',
|
$user = 'glance',
|
||||||
|
@ -11,7 +11,7 @@ class glance::db(
|
||||||
$cluster_id = 'localzone'
|
$cluster_id = 'localzone'
|
||||||
) {
|
) {
|
||||||
|
|
||||||
Class['glance::db'] -> Exec<| title == 'glance-manage db_sync' |>
|
Class['glance::db::mysql'] -> Exec<| title == 'glance-manage db_sync' |>
|
||||||
Database[$dbname] ~> Exec<| title == 'glance-manage db_sync' |>
|
Database[$dbname] ~> Exec<| title == 'glance-manage db_sync' |>
|
||||||
|
|
||||||
require 'mysql::python'
|
require 'mysql::python'
|
||||||
|
@ -27,7 +27,7 @@ class glance::db(
|
||||||
|
|
||||||
if $allowed_hosts {
|
if $allowed_hosts {
|
||||||
# TODO this class should be in the mysql namespace
|
# TODO this class should be in the mysql namespace
|
||||||
glance::db::host_access { $allowed_hosts:
|
glance::db::mysql::host_access { $allowed_hosts:
|
||||||
user => $user,
|
user => $user,
|
||||||
password => $password,
|
password => $password,
|
||||||
database => $dbname,
|
database => $dbname,
|
|
@ -1,5 +1,7 @@
|
||||||
# db/allowed_hosts.pp
|
#
|
||||||
define glance::db::host_access ($user, $password, $database) {
|
# Used to grant access to the glance mysql DB
|
||||||
|
#
|
||||||
|
define glance::db::mysql::host_access ($user, $password, $database) {
|
||||||
database_user { "${user}@${name}":
|
database_user { "${user}@${name}":
|
||||||
password_hash => mysql_password($password),
|
password_hash => mysql_password($password),
|
||||||
provider => 'mysql',
|
provider => 'mysql',
|
Loading…
Reference in New Issue