openstack
/
cookbook-openstack-network
Code Issues Proposed changes

Merge "Changed lbaas packages to use lbaasv2"

This commit is contained in:
Jenkins 2016-12-05 15:38:50 +00:00 committed by Gerrit Code Review
parent 94372fdd4f 4e898caf1f
commit cfc55aee9e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
attributes/default.rb
View File

@ -175,7 +175,7 @@ default['openstack']['network_lbaas']['conf'].tap do |conf|
conf['DEFAULT']['periodic_interval'] = 10 conf['DEFAULT']['periodic_interval'] = 10
conf['DEFAULT']['ovs_use_veth'] = false conf['DEFAULT']['ovs_use_veth'] = false
conf['DEFAULT']['interface_driver'] = 'neutron.agent.linux.interface.OVSInterfaceDriver' conf['DEFAULT']['interface_driver'] = 'neutron.agent.linux.interface.OVSInterfaceDriver'
conf['DEFAULT']['device_driver'] = 'neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver' conf['DEFAULT']['device_driver'] = 'neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver'
case platform_family case platform_family
when 'fedora', 'rhel' when 'fedora', 'rhel'
conf['haproxy']['user_group'] = 'nobody' conf['haproxy']['user_group'] = 'nobody'
@ -211,7 +211,7 @@ default['openstack']['network']['platform'].tap do |platform|
platform['vpn_device_driver_services'] = platform['vpn_device_driver_services'] =
%w(strongswan) %w(strongswan)
platform['neutron_lb_agent_service'] = platform['neutron_lb_agent_service'] =
'neutron-lbaas-agent' 'neutron-lbaasv2-agent'
platform['neutron_metadata_agent_service'] = platform['neutron_metadata_agent_service'] =
'neutron-metadata-agent' 'neutron-metadata-agent'
platform['neutron_metering_agent_service'] = platform['neutron_metering_agent_service'] =
@ -272,7 +272,7 @@ default['openstack']['network']['platform'].tap do |platform|
platform['neutron_vpnaas_packages'] = platform['neutron_vpnaas_packages'] =
%w(python-neutron-vpnaas neutron-vpn-agent) %w(python-neutron-vpnaas neutron-vpn-agent)
platform['neutron_lbaas_packages'] = platform['neutron_lbaas_packages'] =
%w(python-neutron-lbaas neutron-lbaas-agent haproxy) %w(python-neutron-lbaas neutron-lbaas-common neutron-lbaasv2-agent haproxy)
platform['neutron_openvswitch_packages'] = platform['neutron_openvswitch_packages'] =
%w(openvswitch-switch bridge-utils) %w(openvswitch-switch bridge-utils)
platform['neutron_openvswitch_build_packages'] = platform['neutron_openvswitch_build_packages'] =

4
spec/lbaas_spec.rb
View File

@ -12,7 +12,7 @@ describe 'openstack-network::lbaas' do
include_context 'neutron-stubs' include_context 'neutron-stubs'
it do it do
%w(python-neutron-lbaas neutron-lbaas-agent haproxy) %w(python-neutron-lbaas neutron-lbaasv2-agent haproxy)
.each do |pkg| .each do |pkg|
expect(chef_run).to upgrade_package(pkg) expect(chef_run).to upgrade_package(pkg)
end end
@ -33,7 +33,7 @@ describe 'openstack-network::lbaas' do
/^periodic_interval = 10$/, /^periodic_interval = 10$/,
/^ovs_use_veth = false$/, /^ovs_use_veth = false$/,
/^interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver$/, /^interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver$/,
/^device_driver = neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver$/ /^device_driver = neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver$/
].each do |line| ].each do |line|
expect(chef_run).to render_file(file.name).with_content(line) expect(chef_run).to render_file(file.name).with_content(line)
end end