openstack
/
puppet-designate
Code Issues Proposed changes

Merge "Fixup Juno mysql configuration"

This commit is contained in:
Jenkins 2015-02-16 11:05:54 +00:00 committed by Gerrit Code Review
parent b6c463a595 e1cfb0536d
commit d295f0daac
4 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/db.pp
View File

@ -29,27 +29,16 @@ class designate::db (
} }
designate_config { designate_config {
'storage:sqlalchemy/database_connection': value => $database_connection, secret => true; 'storage:sqlalchemy/connection': value => $database_connection, secret => true;
} }
Exec['designate-dbinit'] ~> Exec['designate-dbsync']
exec { 'designate-dbinit':
command => $::designate::params::dbinit_command,
path => '/usr/bin',
user => 'root',
unless => '/usr/bin/mysql designate -e "select * from migrate_version"',
refreshonly => true,
logoutput => on_failure,
subscribe => Designate_config['storage:sqlalchemy/database_connection']
}
exec { 'designate-dbsync': exec { 'designate-dbsync':
command => $::designate::params::dbsync_command, command => $::designate::params::dbsync_command,
path => '/usr/bin', path => '/usr/bin',
user => 'root', user => 'root',
refreshonly => true, refreshonly => true,
logoutput => on_failure, logoutput => on_failure,
subscribe => Designate_config['storage:sqlalchemy/database_connection'] subscribe => Designate_config['storage:sqlalchemy/connection']
} }
} }

2
manifests/db/mysql.pp
View File

@ -51,5 +51,5 @@ class designate::db::mysql(
allowed_hosts => $allowed_hosts, allowed_hosts => $allowed_hosts,
} }
::Openstacklib::Db::Mysql['designate'] ~> Exec<| title == 'designate-dbinit' |> ::Openstacklib::Db::Mysql['designate'] ~> Exec<| title == 'designate-dbsync' |>
} }

4
manifests/params.pp
View File

@ -1,9 +1,7 @@
# Params # Params
# #
class designate::params { class designate::params {
$dbsync_command = 'designate-manage database sync'
$dbinit_command = 'designate-manage database-init'
$dbsync_command = 'designate-manage database-sync'
$state_path = '/var/lib/designate' $state_path = '/var/lib/designate'
# bind path # bind path
$designatepath = "${state_path}/bind9" $designatepath = "${state_path}/bind9"

3
spec/classes/designate_db_spec.rb
View File

@ -9,10 +9,9 @@ describe 'designate::db' do
context 'with default params' do context 'with default params' do
it 'configures designate db with default parameters' do it 'configures designate db with default parameters' do
should contain_designate_config('storage:sqlalchemy/database_connection').with_value('mysql://designate:designate@localhost/designate') should contain_designate_config('storage:sqlalchemy/connection').with_value('mysql://designate:designate@localhost/designate')
should contain_class('mysql::bindings') should contain_class('mysql::bindings')
should contain_class('mysql::bindings::python') should contain_class('mysql::bindings::python')
should contain_exec('designate-dbinit').with(:notify => 'Exec[designate-dbsync]')
should contain_exec('designate-dbsync') should contain_exec('designate-dbsync')
end end
end end