Merge "Revert "Add a local MySQL database to paste.o.o""
This commit is contained in:
commit
d19dc2a484
@ -313,7 +313,6 @@ node 'paste.openstack.org' {
|
||||
class { 'openstack_project::paste':
|
||||
db_password => hiera('paste_db_password'),
|
||||
db_host => hiera('paste_db_host'),
|
||||
mysql_root_password => hiera('paste_mysql_root_password'),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3,7 +3,6 @@
|
||||
class openstack_project::paste (
|
||||
$db_password,
|
||||
$db_host,
|
||||
$mysql_root_password,
|
||||
$vhost_name = $::fqdn,
|
||||
) {
|
||||
include lodgeit
|
||||
@ -14,27 +13,5 @@ class openstack_project::paste (
|
||||
db_user => 'openstack',
|
||||
vhost_name => $vhost_name,
|
||||
image => 'header-bg2.png',
|
||||
require => Mysql::Db['openstack'],
|
||||
}
|
||||
|
||||
class { 'mysql::server':
|
||||
config_hash => {
|
||||
'root_password' => $mysql_root_password,
|
||||
'default_engine' => 'InnoDB',
|
||||
'bind_address' => '127.0.0.1',
|
||||
}
|
||||
}
|
||||
|
||||
include mysql::server::account_security
|
||||
mysql::db { 'openstack':
|
||||
user => 'openstack',
|
||||
password => $db_password,
|
||||
host => 'localhost',
|
||||
grant => ['all'],
|
||||
charset => 'utf8',
|
||||
require => [
|
||||
Class['mysql::server'],
|
||||
Class['mysql::server::account_security'],
|
||||
],
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user