From d22bba88b2c89ce1256af2bee06c30c05bbde688 Mon Sep 17 00:00:00 2001
From: Iury Gregory Melo Ferreira <iurygregory@gmail.com>
Date: Wed, 18 May 2016 18:13:13 -0300
Subject: [PATCH] Remove utilities.pp

utilities.pp should have been removed in mitaka

Change-Id: Ifabeee84e83d3507dfe0d2cc159ff6f453cef3d2
---
 manifests/init.pp                             |  9 --------
 manifests/utilities.pp                        | 22 ------------------
 .../nova-utilities-ea3f8c15895cb820.yaml      |  3 +++
 spec/classes/nova_init_spec.rb                |  9 --------
 spec/classes/nova_utilities_spec.rb           | 23 -------------------
 5 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100644 manifests/utilities.pp
 create mode 100644 releasenotes/notes/nova-utilities-ea3f8c15895cb820.yaml
 delete mode 100644 spec/classes/nova_utilities_spec.rb

diff --git a/manifests/init.pp b/manifests/init.pp
index 42916e796..1c32b6db9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -308,10 +308,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
@@ -393,7 +389,6 @@ class nova(
   $use_ipv6                           = $::os_service_default,
   $purge_config                       = false,
   # DEPRECATED PARAMETERS
-  $install_utilities                  = undef,
   $verbose                            = undef,
 ) inherits nova::params {
 
@@ -467,10 +462,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 880dc1ba8..c7cd33729 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
@@ -95,7 +91,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,
@@ -188,10 +183,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