From 4d0cea3403fe931a5914bf9fad03fcef85f2b7f4 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 29 Dec 2015 20:46:58 +0000 Subject: [PATCH] Revert "Add a local MySQL database to paste.o.o" Remove the local database management on paste.openstack.org now that it's back to running with a remote Trove database again. This reverts commit b7e352cc86bb850fa1c4d6b74253e5450165afa2. Change-Id: I7b8513b427395f610b23e3f226109ea954ee210b --- manifests/site.pp | 1 - modules/openstack_project/manifests/paste.pp | 23 -------------------- 2 files changed, 24 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 396e26e308..983fd50a9b 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -342,7 +342,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'), } } diff --git a/modules/openstack_project/manifests/paste.pp b/modules/openstack_project/manifests/paste.pp index 68bfd592d3..436f897c37 100644 --- a/modules/openstack_project/manifests/paste.pp +++ b/modules/openstack_project/manifests/paste.pp @@ -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'], - ], } }