From 27aadcad07e7e9c7e2e0572f7807d6d2bd77da48 Mon Sep 17 00:00:00 2001 From: Oleksiy Molchanov Date: Wed, 28 Sep 2016 14:52:04 +0300 Subject: [PATCH] Stop conntrackd after installation Change-Id: Icda8af189b5b9cddc7156fe3a135eae0ff42378b Closes-Bug: 1459805 --- deployment/puppet/cluster/manifests/conntrackd_ocf.pp | 8 +++----- tests/noop/spec/hosts/virtual_ips/conntrackd_spec.rb | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/deployment/puppet/cluster/manifests/conntrackd_ocf.pp b/deployment/puppet/cluster/manifests/conntrackd_ocf.pp index c9fdbff54f..e37f6cb8fa 100644 --- a/deployment/puppet/cluster/manifests/conntrackd_ocf.pp +++ b/deployment/puppet/cluster/manifests/conntrackd_ocf.pp @@ -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' diff --git a/tests/noop/spec/hosts/virtual_ips/conntrackd_spec.rb b/tests/noop/spec/hosts/virtual_ips/conntrackd_spec.rb index 6500160dfc..f4ff19f330 100644 --- a/tests/noop/spec/hosts/virtual_ips/conntrackd_spec.rb +++ b/tests/noop/spec/hosts/virtual_ips/conntrackd_spec.rb @@ -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