Fix user_group configuration in lbaas_agent.ini.erb
when using haproxy, user_group should be nobody on rhel,fedora and suse, and nogroup on debian Change-Id: If875bdbecf9867a20afd5264a2fdb814a7729896 Closes-Bug:#1406224
This commit is contained in:
parent
0695636cd1
commit
31f6606586
|
@ -22,6 +22,7 @@ This file is used to list changes made in each version of cookbook-openstack-net
|
|||
* Added the update to iproute, because of the required support for ip netns
|
||||
* Renamed common recipe to default
|
||||
* Allow rabbit ssl in the ha case
|
||||
* Fix user_group configuration in lbaas_agent.ini.erb
|
||||
|
||||
## 10.0.1
|
||||
* Add tunnel_types item in ovs_neutron_plugin.ini.erb
|
||||
|
|
|
@ -13,6 +13,22 @@ describe 'openstack-network::balancer' do
|
|||
|
||||
include_context 'neutron-stubs'
|
||||
|
||||
describe 'lbaas_agent.ini' do
|
||||
let(:file) { chef_run.template('/etc/neutron/lbaas_agent.ini') }
|
||||
|
||||
it 'creates lbaas_agent.ini' do
|
||||
expect(chef_run).to create_template(file.name).with(
|
||||
user: 'neutron',
|
||||
group: 'neutron',
|
||||
mode: 0640
|
||||
)
|
||||
end
|
||||
|
||||
it 'displays user_group as nobody' do
|
||||
expect(chef_run).to render_file('/etc/neutron/lbaas_agent.ini').with_content(/^user_group = nobody$/)
|
||||
end
|
||||
end
|
||||
|
||||
['haproxy', 'openstack-neutron'].each do |pack|
|
||||
it "upgrades #{pack} package" do
|
||||
expect(chef_run).to upgrade_package(pack)
|
||||
|
|
|
@ -73,6 +73,10 @@ describe 'openstack-network::balancer' do
|
|||
node.set['openstack']['network']['lbaas_plugin'] = 'another_lbaas-plugin'
|
||||
expect(chef_run).to render_file(file.name).with_content(/^interface_driver =$/)
|
||||
end
|
||||
|
||||
it 'displays user_group as nogroup' do
|
||||
expect(chef_run).to render_file(file.name).with_content(/^user_group = nogroup$/)
|
||||
end
|
||||
end
|
||||
|
||||
it 'notifies the lb agent service' do
|
||||
|
|
|
@ -37,7 +37,11 @@ device_driver = <%= node['openstack']['network']['lbaas']['device_driver'] %>
|
|||
# loadbalancer_state_path = $state_path/lbaas
|
||||
|
||||
# The user group
|
||||
# user_group = nogroup
|
||||
<% if node['platform_family'] == 'debian' %>
|
||||
user_group = nogroup
|
||||
<% else %>
|
||||
user_group = nobody
|
||||
<% end %>
|
||||
|
||||
# When delete and re-add the same vip, send this many gratuitous ARPs to flush
|
||||
# the ARP cache in the Router. Set it below or equal to 0 to disable this feature.
|
||||
|
|
Loading…
Reference in New Issue