diff --git a/manifests/init.pp b/manifests/init.pp index 6a6a43a81..6ffa24c59 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -372,10 +372,6 @@ # # DEPRECATED PARAMETERS # -# [*install_utilities*] -# (optional) Install nova utilities (Extra packages used by nova tools) -# Defaults to undef -# # [*verbose*] # (optional) Set log output to verbose output. # Defaults to undef @@ -473,7 +469,6 @@ class nova( $use_ipv6 = $::os_service_default, $purge_config = false, # DEPRECATED PARAMETERS - $install_utilities = undef, $verbose = undef, ) inherits nova::params { @@ -551,10 +546,6 @@ class nova( } } - if $install_utilities { - class { '::nova::utilities': } - } - package { 'python-nova': ensure => $ensure_package, tag => ['openstack', 'nova-package'], diff --git a/manifests/utilities.pp b/manifests/utilities.pp deleted file mode 100644 index f1bd02e35..000000000 --- a/manifests/utilities.pp +++ /dev/null @@ -1,22 +0,0 @@ -# == Class nova::utilities -# -# Extra packages used by nova tools -# unzip swig screen parted curl euca2ools libguestfs-tools - extra packages -class nova::utilities { - warning('This class is deprecated and will be removed in Mitaka. Make other plans if you need these packages installed') - if $::osfamily == 'Debian' { - ensure_packages(['unzip', 'screen', 'parted', 'curl', 'euca2ools']) - - package {'libguestfs-tools': - ensure => present, - responsefile => '/var/run/guestfs.seed', - require => File['guestfs.seed'] - } - - file {'guestfs.seed': - ensure => present, - path => '/var/run/guestfs.seed', - content => 'libguestfs0 libguestfs/update-appliance boolean true' - } - } -} diff --git a/releasenotes/notes/nova-utilities-ea3f8c15895cb820.yaml b/releasenotes/notes/nova-utilities-ea3f8c15895cb820.yaml new file mode 100644 index 000000000..ab5812931 --- /dev/null +++ b/releasenotes/notes/nova-utilities-ea3f8c15895cb820.yaml @@ -0,0 +1,3 @@ +--- +other: + - Remove nova::utilities class and tests. diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index f322d097a..9314c12fc 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -69,10 +69,6 @@ describe 'nova' do is_expected.to contain_nova_config('cinder/catalog_info').with('value' => 'volumev2:cinderv2:publicURL') end - it 'does not install utilities' do - is_expected.to_not contain_class('nova::utilities') - end - end context 'with overridden parameters' do @@ -94,7 +90,6 @@ describe 'nova' do :auth_strategy => 'foo', :ensure_package => '2012.1.1-15.el6', :memcached_servers => ['memcached01:11211', 'memcached02:11211'], - :install_utilities => true, :notification_driver => 'ceilometer.compute.nova_notifier', :notification_topics => 'openstack', :notify_api_faults => true, @@ -187,10 +182,6 @@ describe 'nova' do ) } end - it 'installs utilities' do - is_expected.to contain_class('nova::utilities') - end - end context 'with wrong notify_on_state_change parameter' do diff --git a/spec/classes/nova_utilities_spec.rb b/spec/classes/nova_utilities_spec.rb deleted file mode 100644 index 8da06c906..000000000 --- a/spec/classes/nova_utilities_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -require 'spec_helper' - -describe 'nova::utilities' do - - describe 'on debian platforms' do - let :pre_condition do - "class { '::nova': install_utilities => true }" - end - - let :facts do - @default_facts.merge({ :osfamily => 'Debian' }) - end - - it 'installs utilities' do - is_expected.to contain_package('unzip').with_ensure('present') - is_expected.to contain_package('screen').with_ensure('present') - is_expected.to contain_package('parted').with_ensure('present') - is_expected.to contain_package('curl').with_ensure('present') - is_expected.to contain_package('euca2ools').with_ensure('present') - is_expected.to contain_package('libguestfs-tools').with_ensure('present') - end - end -end