Use --subproject instead of deprecated --service option
The --service option to neutron-db-manage is deprecated and will be removed soon. Use --subproject instead. Related-Bug: #1501380 Change-Id: Idf3cbd65a49c676a0f90c0e49684e738e16e659b
This commit is contained in:
parent
123d31c9c2
commit
e80cd7f645
|
@ -33,7 +33,7 @@ end
|
|||
bash 'migrate vpnaas database' do
|
||||
only_if { node['openstack']['network_vpnaas']['enabled'] }
|
||||
timeout timeout
|
||||
migrate_command = "neutron-db-manage --service vpnaas --config-file /etc/neutron/neutron.conf --config-file #{plugin_config_file}"
|
||||
migrate_command = "neutron-db-manage --subproject neutron-vpnaas --config-file /etc/neutron/neutron.conf --config-file #{plugin_config_file}"
|
||||
code <<-EOF
|
||||
#{migrate_command} upgrade head
|
||||
EOF
|
||||
|
@ -43,7 +43,7 @@ end
|
|||
bash 'migrate fwaas database' do
|
||||
only_if { node['openstack']['network_fwaas']['enabled'] }
|
||||
timeout timeout
|
||||
migrate_command = "neutron-db-manage --service fwaas --config-file /etc/neutron/neutron.conf --config-file #{plugin_config_file}"
|
||||
migrate_command = "neutron-db-manage --subproject neutron-fwaas --config-file /etc/neutron/neutron.conf --config-file #{plugin_config_file}"
|
||||
code <<-EOF
|
||||
#{migrate_command} upgrade head
|
||||
EOF
|
||||
|
@ -53,7 +53,7 @@ end
|
|||
bash 'migrate lbaas database' do
|
||||
only_if { node['openstack']['network_lbaas']['enabled'] }
|
||||
timeout timeout
|
||||
migrate_command = "neutron-db-manage --service lbaas --config-file /etc/neutron/neutron.conf --config-file #{plugin_config_file}"
|
||||
migrate_command = "neutron-db-manage --subproject neutron-lbaas --config-file /etc/neutron/neutron.conf --config-file #{plugin_config_file}"
|
||||
code <<-EOF
|
||||
#{migrate_command} upgrade head
|
||||
EOF
|
||||
|
|
|
@ -32,7 +32,7 @@ describe 'openstack-network::db_migration' do
|
|||
node.set['openstack']['network']['core_plugin_config_file'] = '/etc/neutron/plugins/ml2/ml2_conf.ini'
|
||||
end
|
||||
it 'uses db upgrade head when vpnaas is enabled' do
|
||||
migrate_cmd = %r{neutron-db-manage --service vpnaas --config-file /etc/neutron/neutron.conf|
|
||||
migrate_cmd = %r{neutron-db-manage --subproject neutron-vpnaas --config-file /etc/neutron/neutron.conf|
|
||||
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head}
|
||||
expect(chef_run).to run_bash('migrate vpnaas database').with(
|
||||
code: migrate_cmd,
|
||||
|
@ -40,7 +40,7 @@ describe 'openstack-network::db_migration' do
|
|||
)
|
||||
end
|
||||
it 'uses db upgrade head when lbaas is enabled' do
|
||||
migrate_cmd = %r{neutron-db-manage --service lbaas --config-file /etc/neutron/neutron.conf|
|
||||
migrate_cmd = %r{neutron-db-manage --subproject neutron-lbaas --config-file /etc/neutron/neutron.conf|
|
||||
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head}
|
||||
expect(chef_run).to run_bash('migrate lbaas database').with(
|
||||
code: migrate_cmd,
|
||||
|
@ -48,7 +48,7 @@ describe 'openstack-network::db_migration' do
|
|||
)
|
||||
end
|
||||
it 'uses db upgrade head when fwaas is enabled' do
|
||||
migrate_cmd = %r{neutron-db-manage --service fwaas --config-file /etc/neutron/neutron.conf|
|
||||
migrate_cmd = %r{neutron-db-manage --subproject neutron-fwaas --config-file /etc/neutron/neutron.conf|
|
||||
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head}
|
||||
expect(chef_run).to run_bash('migrate fwaas database').with(
|
||||
code: migrate_cmd,
|
||||
|
@ -62,7 +62,7 @@ describe 'openstack-network::db_migration' do
|
|||
end
|
||||
|
||||
it 'does not use db upgrade head when vpnaas is not enabled' do
|
||||
migrate_cmd = %r{neutron-db-manage --service vpnaas --config-file /etc/neutron/neutron.conf|
|
||||
migrate_cmd = %r{neutron-db-manage --subproject neutron-vpnaas --config-file /etc/neutron/neutron.conf|
|
||||
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head}
|
||||
expect(chef_run).not_to run_bash('migrate vpnaas database').with(
|
||||
code: migrate_cmd,
|
||||
|
@ -71,7 +71,7 @@ describe 'openstack-network::db_migration' do
|
|||
end
|
||||
|
||||
it 'does not use db upgrade head when fwaas is not enabled' do
|
||||
migrate_cmd = %r{neutron-db-manage --service fwaas --config-file /etc/neutron/neutron.conf|
|
||||
migrate_cmd = %r{neutron-db-manage --subproject neutron-fwaas --config-file /etc/neutron/neutron.conf|
|
||||
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head}
|
||||
expect(chef_run).not_to run_bash('migrate fwaas database').with(
|
||||
code: migrate_cmd,
|
||||
|
@ -80,7 +80,7 @@ describe 'openstack-network::db_migration' do
|
|||
end
|
||||
|
||||
it 'does not use db upgrade head when lbaas is not enabled' do
|
||||
migrate_cmd = %r{neutron-db-manage --service lbaas --config-file /etc/neutron/neutron.conf|
|
||||
migrate_cmd = %r{neutron-db-manage --subproject neutron-lbaas --config-file /etc/neutron/neutron.conf|
|
||||
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head}
|
||||
expect(chef_run).not_to run_bash('migrate lbaas database').with(
|
||||
code: migrate_cmd,
|
||||
|
|
Loading…
Reference in New Issue