openstack
/
cookbook-openstack-network
Code Issues Proposed changes

Ubuntu mitaka package name changes for openvswitch agent 

neutron-openvswitch-agent
Replaces:
  neutron-plugin-ml2 (<< 2:8.0.0~b2-0ubuntu5~)
  neutron-plugin-openvswitch-agent (<< 2:8.0.0~b2-0ubuntu1~)

Change-Id: Icd75ff370f20d77f564bd6eb700704372345b0de
This commit is contained in:
Mark Vanderwiel 2016-04-06 12:10:34 -05:00
parent f20cfbe66b
commit 820c8eebdb
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
attributes/default.rb
View File

@ -283,7 +283,7 @@ default['openstack']['network']['platform'].tap do |platform|
python-twisted-conch
)
platform['neutron_openvswitch_agent_packages'] =
%w(neutron-plugin-openvswitch neutron-plugin-openvswitch-agent)
%w(neutron-openvswitch-agent)
platform['neutron_linuxbridge_agent_packages'] =
%w(neutron-plugin-linuxbridge neutron-plugin-linuxbridge-agent)
platform['neutron_linuxbridge_agent_service'] =
@ -297,7 +297,7 @@ default['openstack']['network']['platform'].tap do |platform|
platform['neutron_openvswitch_service'] =
'openvswitch-switch'
platform['neutron_openvswitch_agent_service'] =
'neutron-plugin-openvswitch-agent'
'neutron-openvswitch-agent'
platform['package_overrides'] =
"-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'"
end

2
recipes/openvswitch_agent.rb
View File

@ -39,7 +39,7 @@ execute 'create integration network bridge' do
action :run
end
service 'neutron-plugin-openvswitch-agent' do
service 'neutron-openvswitch-agent' do
service_name platform_options['neutron_openvswitch_agent_service']
supports status: true, restart: true
action [:enable, :start]

6
spec/openvswitch_agent_spec.rb
View File

@ -14,7 +14,7 @@ describe 'openstack-network::openvswitch_agent' do
end
it 'upgrades openvswitch agent' do
expect(chef_run).to upgrade_package 'neutron-plugin-openvswitch-agent'
expect(chef_run).to upgrade_package 'neutron-openvswitch-agent'
end
describe 'create integration network bridget' do
@ -27,11 +27,11 @@ describe 'openstack-network::openvswitch_agent' do
end
it 'sets the openvswitch_agent service to start on boot' do
expect(chef_run).to enable_service 'neutron-plugin-openvswitch-agent'
expect(chef_run).to enable_service 'neutron-openvswitch-agent'
end
it 'starts the openvswitch_agent service' do
expect(chef_run).to start_service 'neutron-plugin-openvswitch-agent'
expect(chef_run).to start_service 'neutron-openvswitch-agent'
end
end
end