From b7e352cc86bb850fa1c4d6b74253e5450165afa2 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 8 Jan 2015 16:49:58 +0000 Subject: [PATCH] Add a local MySQL database to paste.o.o Due to performance problems with the current Trove backend, add a MySQL database locally on paste.openstack.org for later use. Change-Id: Idc04a95ba157e4d3722c3ea8a703e52c5793976c --- manifests/site.pp | 7 +++--- modules/openstack_project/manifests/paste.pp | 23 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index c4de6c251b..681c946612 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -247,9 +247,10 @@ node 'lists.openstack.org' { # Node-OS: precise node 'paste.openstack.org' { class { 'openstack_project::paste': - db_host => hiera('paste_db_host', 'localhost'), - db_password => hiera('paste_db_password', 'XXX'), - sysadmins => hiera('sysadmins', []), + db_host => hiera('paste_db_host', 'localhost'), + db_password => hiera('paste_db_password', 'XXX'), + mysql_root_password => hiera('paste_mysql_root_password', 'XXX'), + sysadmins => hiera('sysadmins', []), } } diff --git a/modules/openstack_project/manifests/paste.pp b/modules/openstack_project/manifests/paste.pp index cb52f75c28..5355d3914e 100644 --- a/modules/openstack_project/manifests/paste.pp +++ b/modules/openstack_project/manifests/paste.pp @@ -3,6 +3,7 @@ class openstack_project::paste ( $db_host, $db_password, + $mysql_root_password, $sysadmins = [] ) { class { 'openstack_project::server': @@ -15,5 +16,27 @@ class openstack_project::paste ( db_password => $db_password, port => '5000', 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'], + ], } }