diff --git a/contrail/environment/modules/contrail/manifests/config/install.pp b/contrail/environment/modules/contrail/manifests/config/install.pp index 029be373..6b39861b 100644 --- a/contrail/environment/modules/contrail/manifests/config/install.pp +++ b/contrail/environment/modules/contrail/manifests/config/install.pp @@ -10,29 +10,20 @@ if ($contrail_internal_vip == "" and ($internal_vip == "" or !('openstack' in $contrail_host_roles))) { if ($lsbdistrelease == "14.04") { - case $::openstack_release { - 'kilo': { - $keepalived_version = '1:1.2.7-1ubuntu1' - } - default: { - $keepalived_version = '1.2.13-0~276~ubuntu14.04.1' - } - } - $keepalived_pkg = $keepalived_version + $keepalived_pkg = '1.2.13-0~276~ubuntu14.04.1' } else { $keepalived_pkg = '1:1.2.13-1~bpo70+1' } package { 'keepalived' : ensure => $keepalived_pkg, - before => Package['contrail-openstack-config'], } -> service { "keepalived" : enable => false, ensure => stopped, - before => Package['contrail-openstack-config'], } + Package['keepalived'] -> Package['contrail-openstack-config'] } package { 'contrail-openstack-config' :