diff --git a/manifests/agents/ovs.pp b/manifests/agents/ovs.pp index afcb85454..289f67f17 100644 --- a/manifests/agents/ovs.pp +++ b/manifests/agents/ovs.pp @@ -124,12 +124,10 @@ Package['neutron-plugin-ovs'] -> Neutron_plugin_ovs<||> Package['neutron-plugin-ovs'] -> Service['ovs-cleanup-service'] - if ! defined(Package['neutron-plugin-ovs']) { - package { 'neutron-plugin-ovs': - ensure => $package_ensure, - name => $::neutron::params::ovs_server_package, - } - } + ensure_resource('package', 'neutron-plugin-ovs', { + ensure => $package_ensure, + name => $::neutron::params::ovs_server_package, + }) } if $manage_service { diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp index 49ff705ec..cde5c7fea 100644 --- a/manifests/plugins/ml2.pp +++ b/manifests/plugins/ml2.pp @@ -158,10 +158,10 @@ # Specific plugin configuration if ('openvswitch' in $mechanism_drivers) { if ($::osfamily == 'RedHat') { - package { 'neutron-plugin-ovs': + ensure_resource('package', 'neutron-plugin-ovs', { ensure => present, name => $::neutron::params::ovs_server_package, - } + }) Package['neutron-plugin-ovs'] -> Neutron_plugin_ovs<||> } if ('l2population' in $mechanism_drivers) {