openstack
/
fuel-library
Code Issues Proposed changes

Stop conntrackd after installation 

Change-Id: Icda8af189b5b9cddc7156fe3a135eae0ff42378b
Closes-Bug: 1459805
This commit is contained in:
Oleksiy Molchanov 2016-09-28 14:52:04 +03:00
parent b3294c77a8
commit 27aadcad07
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/puppet/cluster/manifests/conntrackd_ocf.pp
View File

@ -4,11 +4,7 @@ class cluster::conntrackd_ocf (
$mgmt_bridge,
) {
$service_name = 'p_conntrackd'
case $operatingsystem {
'Centos': { $conntrackd_package = 'conntrack-tools' }
'Ubuntu': { $conntrackd_package = 'conntrackd' }
}
$conntrackd_package = 'conntrackd'
package { $conntrackd_package:
ensure => 'installed',
@ -23,6 +19,8 @@ class cluster::conntrackd_ocf (
enable => true,
}
tweaks::ubuntu_service_override { 'conntrackd': }
$primitive_class = 'ocf'
$primitive_provider = 'fuel'
$primitive_type = 'ns_conntrackd'

3
tests/noop/spec/hosts/virtual_ips/conntrackd_spec.rb
View File

@ -20,6 +20,9 @@ describe manifest do
end
}
it 'should override conntrackd service' do
should contain_tweaks__ubuntu_service_override('conntrackd')
end
end
test_ubuntu_and_centos manifest
end