diff --git a/contrail/environment/modules/contrail/manifests/keepalived/keepalived.pp b/contrail/environment/modules/contrail/manifests/keepalived/keepalived.pp index 8dfc3bf3..420609ee 100644 --- a/contrail/environment/modules/contrail/manifests/keepalived/keepalived.pp +++ b/contrail/environment/modules/contrail/manifests/keepalived/keepalived.pp @@ -66,18 +66,5 @@ } -> Class['::keepalived'] - # for contrail HA, use correct keepalived version for centos - if ($lsbdistrelease == "14.04") { - $pkg_ensure = '1.2.13-0~276~ubuntu14.04.1' - } elif ($::operatingsystem == 'Centos' or $::operatingsystem == 'Fedora') { - $pkg_ensure = 'present' - } else { - $pkg_ensure = '1:1.2.13-1~bpo70+1' - } - - class { '::keepalived' : - pkg_ensure => $pkg_ensure - } - contain ::keepalived } diff --git a/contrail/environment/modules/keepalived/manifests/params.pp b/contrail/environment/modules/keepalived/manifests/params.pp index ec757243..93daa72c 100644 --- a/contrail/environment/modules/keepalived/manifests/params.pp +++ b/contrail/environment/modules/keepalived/manifests/params.pp @@ -6,6 +6,15 @@ $service_ensure = 'running' $service_manage = true + # for contrail HA, use correct keepalived version for centos + if ($lsbdistrelease == "14.04") { + $pkg_ensure = '1.2.13-0~276~ubuntu14.04.1' + } elsif ($::operatingsystem == 'Centos' or $::operatingsystem == 'Fedora') { + $pkg_ensure = 'present' + } else { + $pkg_ensure = '1:1.2.13-1~bpo70+1' + } + case $::osfamily { 'redhat': { $config_dir = '/etc/keepalived'