diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 6486e969e..616c80fe6 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -5,13 +5,13 @@ # # [*extra_params*] # (optional) String of extra command line parameters to append -# to the neutron-db-manage upgrade head command. These will be +# to the neutron-db-manage upgrade heads command. These will be # inserted in the command line between 'neutron-db-manage' and -# 'upgrade head'. -# Defaults to '--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini' +# 'upgrade heads'. +# Defaults to '' # class neutron::db::sync( - $extra_params = '--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini', + $extra_params = '', ) { include ::neutron::deps diff --git a/manifests/plugins/midonet.pp b/manifests/plugins/midonet.pp index 6d81e0ff4..407727aca 100644 --- a/manifests/plugins/midonet.pp +++ b/manifests/plugins/midonet.pp @@ -138,7 +138,7 @@ class neutron::plugins::midonet ( if $sync_db { Package<| title == 'python-networking-midonet' |> ~> Exec['midonet-db-sync'] exec { 'midonet-db-sync': - command => 'neutron-db-manage --subproject networking-midonet upgrade head', + command => 'neutron-db-manage --subproject networking-midonet upgrade heads', path => '/usr/bin', subscribe => [ Anchor['neutron::install::end'], diff --git a/spec/classes/neutron_db_sync_spec.rb b/spec/classes/neutron_db_sync_spec.rb index 111755d93..dc07e58a1 100644 --- a/spec/classes/neutron_db_sync_spec.rb +++ b/spec/classes/neutron_db_sync_spec.rb @@ -6,7 +6,7 @@ describe 'neutron::db::sync' do it 'runs neutron-db-sync' do is_expected.to contain_exec('neutron-db-sync').with( - :command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugin.ini upgrade heads', + :command => 'neutron-db-manage upgrade heads', :path => '/usr/bin', :refreshonly => 'true', :try_sleep => 5,