--- a/components/ruby/puppet-modules/openstack-nova/patches/03-init.patch Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/03-init.patch Wed Apr 27 14:55:10 2016 -0700
@@ -2,12 +2,20 @@
has not yet been submitted upstream due to requirements for 3rd party
CI testing.
---- openstack-nova-6.1.0/manifests/init.pp.orig 2015-08-10 11:07:11.797692743 -0700
-+++ openstack-nova-6.1.0/manifests/init.pp 2015-08-10 11:08:05.453328148 -0700
-@@ -397,12 +397,6 @@ class nova(
+--- 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
+@@ -397,12 +401,6 @@
Package['nova-common'] -> Nova_config<| |> -> File['/etc/nova/nova.conf']
Nova_config<| |> ~> Exec['post-nova_config']
-
+
- # TODO - see if these packages can be removed
- # they should be handled as package deps by the OS
- package { 'python-greenlet':
@@ -17,10 +25,10 @@
if $install_utilities {
class { '::nova::utilities': }
}
-@@ -411,23 +405,14 @@ class nova(
+@@ -411,23 +409,14 @@
# allowing a resource to serve as a point where the configuration of nova begins
anchor { 'nova-start': }
-
+
- package { 'python-nova':
- ensure => $ensure_package,
- require => Package['python-greenlet'],
@@ -34,15 +42,15 @@
+ require => Anchor['nova-start'],
tag => ['openstack'],
}
-
+
file { '/etc/nova/nova.conf':
- mode => '0640',
- owner => 'nova',
- group => 'nova',
require => Package['nova-common'],
}
-
-@@ -576,9 +561,6 @@ class nova(
+
+@@ -576,9 +565,6 @@
if $log_dir {
file { $log_dir:
ensure => directory,