Browse Source

Merge "Changed lbaas packages to use lbaasv2"

Jenkins 2 years ago
parent
commit
cfc55aee9e
2 changed files with 5 additions and 5 deletions
  1. 3
    3
      attributes/default.rb
  2. 2
    2
      spec/lbaas_spec.rb

+ 3
- 3
attributes/default.rb View File

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

+ 2
- 2
spec/lbaas_spec.rb View File

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

Loading…
Cancel
Save