--- a/components/ruby/puppet-modules/openstack-nova/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,37 +2,25 @@
has not yet been submitted upstream due to requirements for 3rd party
CI testing.
---- openstack-nova-6.1.0/metadata.json.orig 2015-10-15 09:23:28.760348010 -0700
-+++ openstack-nova-6.1.0/metadata.json 2015-10-15 09:23:50.802116009 -0700
-@@ -8,8 +8,6 @@
- "project_page": "https://launchpad.net/puppet-nova",
- "issues_url": "https://bugs.launchpad.net/puppet-nova",
- "dependencies": [
-- {"name":"dprince/qpid","version_requirement":">=1.0.0 <2.0.0"},
-- {"name":"duritong/sysctl","version_requirement":">=0.0.1 <1.0.0"},
- {"name":"openstack/cinder","version_requirement":">=6.0.0 <7.0.0"},
- {"name":"openstack/glance","version_requirement":">=6.0.0 <7.0.0"},
- {"name":"puppetlabs/inifile","version_requirement":">=1.0.0 <2.0.0"},
-@@ -54,6 +52,13 @@
- "12.04",
+--- openstack-nova-8.2.0/metadata.json.orig 2016-08-07 11:50:24.365833250 -0700
++++ openstack-nova-8.2.0/metadata.json 2016-08-07 11:50:58.069311714 -0700
+@@ -29,12 +29,18 @@
+ "operatingsystemrelease": [
"14.04"
]
+ },
+ {
+ "operatingsystem": "Solaris",
+ "operatingsystemrelease": [
-+ "11.3",
-+ "12.0"
++ "12.0",
++ "11.3"
+ ]
}
],
- "description": "Installs and configures OpenStack Nova (Compute)."
-
---- openstack-nova-6.1.0/README.md.orig 2016-04-27 12:14:40.022335012 -0700
-+++ openstack-nova-6.1.0/README.md 2016-04-27 12:14:49.534359893 -0700
-@@ -1,3 +1,5 @@
-+NOTE: Oracle has modified the originally distributed contents of metadata.json.
-+
- nova
- ====
-
+ "description": "Installs and configures OpenStack Nova (Compute).",
+ "dependencies": [
+ {"name":"puppetlabs/apache","version_requirement":">=1.8.0 <2.0.0"},
+- {"name":"duritong/sysctl","version_requirement":">=0.0.1 <1.0.0"},
+ {"name":"openstack/cinder","version_requirement":">=8.2.0 <9.0.0"},
+ {"name":"openstack/glance","version_requirement":">=8.2.0 <9.0.0"},
+ {"name":"puppetlabs/inifile","version_requirement":">=1.4.0 <2.0.0"},