--- a/components/ruby/puppet-modules/openstack-cinder/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-cinder/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,8 +2,8 @@
has not yet been submitted upstream due to requirements for 3rd party
CI testing.
---- openstack-cinder-6.1.0/manifests/params.pp.orig 2016-04-21 07:42:54.508653869 -0700
-+++ openstack-cinder-6.1.0/manifests/params.pp 2016-04-21 07:43:26.330669185 -0700
+--- openstack-cinder-8.0.1/manifests/params.pp.orig 2015-10-15 09:42:47.576607396 -0600
++++ openstack-cinder-8.0.1/manifests/params.pp 2015-10-15 09:43:48.776845153 -0600
@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
@@ -12,11 +12,12 @@
# == Class: cinder::params
#
class cinder::params {
-@@ -51,7 +55,24 @@
+@@ -57,7 +57,26 @@ class cinder::params {
}
}
+ } elsif($::osfamily == 'Solaris') {
++
+ $package_name = 'cloud/openstack/cinder'
+ $client_package = 'library/python/cinderclient'
+ $api_package = undef
@@ -33,8 +34,9 @@
+ $ceph_init_override = undef
+ $iscsi_helper = undef
+ $lio_package_name = undef
++
} else {
- fail("unsupported osfamily ${::osfamily}, currently Debian and Redhat are the only supported platforms")
-+ fail("unsupported osfamily ${::osfamily}, currently Solaris, Debian, and Redhat are the only supported platforms")
++ fail("unsupported osfamily ${::osfamily}, currently Debian, Redhat, and Solaris are the only supported platforms")
}
}