diff --git a/.fixtures.yml b/.fixtures.yml index a6589ee6..ac475a5f 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -27,6 +27,8 @@ fixtures: 'heat': repo: 'git://github.com/enovance/puppet-heat' ref: '025b8cb830d7fa476c4ab1a0b0228b88b5ba10c3' + 'trove': + repo: 'git://github.com/enovance/puppet-trove' 'apt': repo: 'git://github.com/enovance/puppetlabs-apt.git' ref: '9b001af8775c7231ea2656b7eb43d6141b536f49' diff --git a/manifests/database/sql.pp b/manifests/database/sql.pp index d8d20777..de5b1acd 100644 --- a/manifests/database/sql.pp +++ b/manifests/database/sql.pp @@ -51,6 +51,10 @@ class cloud::database::sql ( $neutron_db_user = 'neutron', $neutron_db_password = 'neutronpassword', $neutron_db_allowed_hosts = ['127.0.0.1'], + $trove_db_host = '127.0.0.1', + $trove_db_user = 'trove', + $trove_db_password = 'trovepassword', + $trove_db_allowed_hosts = ['127.0.0.1'], $mysql_root_password = 'rootpassword', $mysql_sys_maint_password = 'sys_maint', $galera_clustercheck_dbuser = 'clustercheckdbuser', @@ -208,6 +212,14 @@ class cloud::database::sql ( allowed_hosts => $heat_db_allowed_hosts, } + class { 'trove::db::mysql': + dbname => 'trove', + user => $trove_db_user, + password => $trove_db_password, + host => $trove_db_host, + allowed_hosts => $trove_db_allowed_hosts, + } + # Monitoring DB warning('Database mapping must be updated to puppetlabs/puppetlabs-mysql >= 2.x (see: https://dev.ring.enovance.com/redmine/issues/4510)') diff --git a/spec/classes/cloud_database_sql_spec.rb b/spec/classes/cloud_database_sql_spec.rb index 704f4524..c6071495 100644 --- a/spec/classes/cloud_database_sql_spec.rb +++ b/spec/classes/cloud_database_sql_spec.rb @@ -56,6 +56,10 @@ describe 'cloud::database::sql' do :neutron_db_user => 'neutron', :neutron_db_password => 'secrete', :neutron_db_allowed_hosts => ['10.0.0.1','10.0.0.2','10.0.0.3'], + :trove_db_host => '10.0.0.1', + :trove_db_user => 'trove', + :trove_db_password => 'secrete', + :trove_db_allowed_hosts => ['10.0.0.1','10.0.0.2','10.0.0.3'], :mysql_root_password => 'secrete', :mysql_sys_maint_password => 'sys', :galera_clustercheck_dbuser => 'clustercheckuser', @@ -152,6 +156,15 @@ describe 'cloud::database::sql' do :allowed_hosts => ['10.0.0.1','10.0.0.2','10.0.0.3'] ) end + it 'configure trove database' do + should contain_class('trove::db::mysql').with( + :dbname => 'trove', + :user => 'trove', + :password => 'secrete', + :host => '10.0.0.1', + :allowed_hosts => ['10.0.0.1','10.0.0.2','10.0.0.3'] ) + end + it 'configure monitoring database' do should contain_database('monitoring').with( :ensure => 'present',