--- a/components/ruby/puppet-modules/openstack-openstacklib/patches/01-metadata.patch	Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-openstacklib/patches/01-metadata.patch	Wed Sep 07 14:48:35 2016 -0700
@@ -2,38 +2,29 @@
 has not yet been submitted upstream due to requirements for 3rd party
 CI testing.
 
---- openstack-openstacklib-6.1.0/metadata.json.orig   2015-10-15 09:31:01.371175733 -0700
-+++ openstack-openstacklib-6.1.0/metadata.json       2015-10-15 09:31:40.878053925 -0700
-@@ -11,8 +11,7 @@
-     {"name":"puppetlabs/apache","version_requirement":">=1.0.0 <2.0.0"},
-     {"name":"puppetlabs/mysql","version_requirement":">=3.0.0 <4.0.0"},
-     {"name":"puppetlabs/stdlib","version_requirement":">=4.0.0 <5.0.0"},
--    {"name":"puppetlabs/rabbitmq","version_requirement":">=2.0.2 <6.0.0"},
--    {"name":"puppetlabs/postgresql","version_requirement":">=3.3.0 <4.0.0"}
-+    {"name":"puppetlabs/rabbitmq","version_requirement":">=2.0.2 <6.0.0"}
-   ],
-   "requirements": [
-     {
-@@ -50,6 +49,13 @@
-         "12.04",
+--- openstack-openstacklib-8.2.0/metadata.json.orig   2016-08-07 12:05:21.251224531 -0700
++++ openstack-openstacklib-8.2.0/metadata.json       2016-08-07 12:05:59.016560234 -0700
+@@ -29,6 +29,13 @@
+       "operatingsystemrelease": [
          "14.04"
        ]
 +    },
 +    {
 +      "operatingsystem": "Solaris",
 +      "operatingsystemrelease": [
-+        "11.3",
-+        "12.0"
++        "12.0",
++        "11.3"
 +      ]
      }
    ],
-   "description": "Puppet module library to expose common functionality between OpenStack modules."
+   "description": "Puppet module library to expose common functionality between OpenStack modules.",
+@@ -37,7 +44,6 @@
+     {"name":"puppetlabs/inifile","version_requirement":">=1.4.0 <2.0.0"},
+     {"name":"puppetlabs/mysql","version_requirement":">=3.6.0 <4.0.0"},
+     {"name":"puppetlabs/stdlib","version_requirement":">=4.9.0 <5.0.0"},
+-    {"name":"puppetlabs/rabbitmq","version_requirement":">=5.3.1 <6.0.0"},
+-    {"name":"puppetlabs/postgresql","version_requirement":">=4.6.0 <5.0.0"}
++    {"name":"puppetlabs/rabbitmq","version_requirement":">=5.3.1 <6.0.0"}
+   ]
+ }
 
---- openstack-openstacklib-6.1.0/README.md.orig	2016-04-27 12:15:45.286079312 -0700
-+++ openstack-openstacklib-6.1.0/README.md	2016-04-27 12:15:54.419984548 -0700
-@@ -1,3 +1,5 @@
-+NOTE: Oracle has modified the originally distributed contents of metadata.json.
-+
- openstacklib
- ============
-