stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #341 from enovance/bug/340/emilien

Browse Source 
network: db sync from havana tag
This commit is contained in:
Yanis Guenane 2014-03-06 03:27:19 -05:00
commit 550e155083
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/network/controller.pp
View File

@ -46,7 +46,7 @@ class cloud::network::controller(
# We check if DB tables are created, if not we populate Neutron DB. # We check if DB tables are created, if not we populate Neutron DB.
# It's a hack to fit with our setup where we run MySQL/Galera # It's a hack to fit with our setup where we run MySQL/Galera
exec {'neutron_db_sync': exec {'neutron_db_sync':
command => '/usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head', command => '/usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade havana',
unless => "/usr/bin/mysql neutron -h ${neutron_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | /bin/grep Tables" unless => "/usr/bin/mysql neutron -h ${neutron_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | /bin/grep Tables"
} }

2
spec/classes/cloud_network_controller_spec.rb
View File

@ -90,7 +90,7 @@ describe 'cloud::network::controller' do
it 'checks if Neutron DB is populated' do it 'checks if Neutron DB is populated' do
should contain_exec('neutron_db_sync').with( should contain_exec('neutron_db_sync').with(
:command => '/usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head', :command => '/usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade havana',
:unless => '/usr/bin/mysql neutron -h 10.0.0.1 -u neutron -psecrete -e "show tables" | /bin/grep Tables' :unless => '/usr/bin/mysql neutron -h 10.0.0.1 -u neutron -psecrete -e "show tables" | /bin/grep Tables'
) )
end end