Merge "Fixup Juno mysql configuration"
This commit is contained in:
commit
d295f0daac
|
@ -29,27 +29,16 @@ class designate::db (
|
|||
}
|
||||
|
||||
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':
|
||||
command => $::designate::params::dbsync_command,
|
||||
path => '/usr/bin',
|
||||
user => 'root',
|
||||
refreshonly => true,
|
||||
logoutput => on_failure,
|
||||
subscribe => Designate_config['storage:sqlalchemy/database_connection']
|
||||
subscribe => Designate_config['storage:sqlalchemy/connection']
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -51,5 +51,5 @@ class designate::db::mysql(
|
|||
allowed_hosts => $allowed_hosts,
|
||||
}
|
||||
|
||||
::Openstacklib::Db::Mysql['designate'] ~> Exec<| title == 'designate-dbinit' |>
|
||||
::Openstacklib::Db::Mysql['designate'] ~> Exec<| title == 'designate-dbsync' |>
|
||||
}
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
# Params
|
||||
#
|
||||
class designate::params {
|
||||
|
||||
$dbinit_command = 'designate-manage database-init'
|
||||
$dbsync_command = 'designate-manage database-sync'
|
||||
$dbsync_command = 'designate-manage database sync'
|
||||
$state_path = '/var/lib/designate'
|
||||
# bind path
|
||||
$designatepath = "${state_path}/bind9"
|
||||
|
|
|
@ -9,10 +9,9 @@ describe 'designate::db' do
|
|||
|
||||
context 'with default params' 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::python')
|
||||
should contain_exec('designate-dbinit').with(:notify => 'Exec[designate-dbsync]')
|
||||
should contain_exec('designate-dbsync')
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue