components/ruby/puppet-modules/openstack-nova/patches/03-init.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 02 May 2017 17:33:26 -0700
changeset 7964 d9801318ed3d
parent 6817 e4a26f447d0c
permissions -rw-r--r--
25981468 Build ilmbase and openexr with the GNU compilers

In-house patch to add support for Solaris 11.3 and 12.0.  This patch
has not yet been submitted upstream due to requirements for 3rd party
CI testing.

--- openstack-nova-6.1.0/manifests/init.pp.orig	2016-04-21 08:28:14.920659366 -0700
+++ openstack-nova-6.1.0/manifests/init.pp	2016-04-21 08:28:26.073126710 -0700
@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
+
 # == Class: nova
 #
 # This class is used to specify configuration parameters that are common
@@ -511,15 +515,9 @@ class nova(
     class { '::nova::utilities': }
   }

-  package { 'python-nova':
-    ensure => $ensure_package,
-    tag    => ['openstack', 'nova-package'],
-  }
-
   package { 'nova-common':
     ensure  => $ensure_package,
     name    => $::nova::params::common_package_name,
-    require => Package['python-nova'],
     tag     => ['openstack', 'nova-package'],
   }