diff --git a/manifests/init.pp b/manifests/init.pp index c3ae42e..2752ee6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,7 +4,7 @@ # # === Parameters # -# [*ensure_package*] +# [*package_ensure*] # (optional) The state of vitrage packages # Defaults to 'present' # @@ -194,7 +194,7 @@ # Defaults to false. # class vitrage ( - $ensure_package = 'present', + $package_ensure = 'present', $default_transport_url = $::os_service_default, $rpc_response_timeout = $::os_service_default, $control_exchange = $::os_service_default, @@ -241,7 +241,7 @@ class vitrage ( include ::vitrage::logging package { 'vitrage': - ensure => $ensure_package, + ensure => $package_ensure, name => $::vitrage::params::common_package_name, tag => ['openstack', 'vitrage-package'], } diff --git a/spec/classes/vitrage_init_spec.rb b/spec/classes/vitrage_init_spec.rb index e875bd7..d50169a 100644 --- a/spec/classes/vitrage_init_spec.rb +++ b/spec/classes/vitrage_init_spec.rb @@ -56,7 +56,7 @@ describe 'vitrage' do :rabbit_heartbeat_timeout_threshold => '60', :rabbit_heartbeat_rate => '10', :kombu_compression => 'gzip', - :ensure_package => '2012.1.1-15.el6', + :package_ensure => '2012.1.1-15.el6', :notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673', :notification_driver => 'messaging', :notification_topics => 'openstack',