components/ruby/puppet-modules/openstack-nova/patches/03-init.patch
author Laszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:35 -0700
changeset 6817 e4a26f447d0c
parent 5860 afd31ba91ee9
permissions -rw-r--r--
24454308 update all openstack puppet modules to the latest mitaka release
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     1
In-house patch to add support for Solaris 11.3 and 12.0.  This patch
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     2
has not yet been submitted upstream due to requirements for 3rd party
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     3
CI testing.
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
     4
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     5
--- openstack-nova-6.1.0/manifests/init.pp.orig	2016-04-21 08:28:14.920659366 -0700
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     6
+++ openstack-nova-6.1.0/manifests/init.pp	2016-04-21 08:28:26.073126710 -0700
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     7
@@ -1,3 +1,7 @@
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     8
+#######################################################################
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
     9
+# Oracle has modified the originally distributed contents of this file.
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    10
+#######################################################################
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    11
+
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    12
 # == Class: nova
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    13
 #
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5464
diff changeset
    14
 # This class is used to specify configuration parameters that are common
6817
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    15
@@ -511,15 +515,9 @@ class nova(
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    16
     class { '::nova::utilities': }
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    17
   }
6817
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    18
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    19
-  package { 'python-nova':
6817
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    20
-    ensure => $ensure_package,
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    21
-    tag    => ['openstack', 'nova-package'],
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    22
-  }
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    23
-
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    24
   package { 'nova-common':
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    25
     ensure  => $ensure_package,
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    26
     name    => $::nova::params::common_package_name,
6817
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    27
-    require => Package['python-nova'],
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    28
     tag     => ['openstack', 'nova-package'],
5464
6e2e17e6aa45 PSARC/2016/001 OpenStack Puppet Modules
Drew Fisher <drew.fisher@oracle.com>
parents:
diff changeset
    29
   }
6817
e4a26f447d0c 24454308 update all openstack puppet modules to the latest mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents: 5860
diff changeset
    30