components/ruby/puppet-modules/openstack-openstacklib/patches/01-metadata.patch
changeset 6817 e4a26f447d0c
parent 5860 afd31ba91ee9
equal deleted inserted replaced
6816:bb11bcf4ebf8 6817:e4a26f447d0c
     1 In-house patch to add support for Solaris 11.3 and 12.0.  This patch
     1 In-house patch to add support for Solaris 11.3 and 12.0.  This patch
     2 has not yet been submitted upstream due to requirements for 3rd party
     2 has not yet been submitted upstream due to requirements for 3rd party
     3 CI testing.
     3 CI testing.
     4 
     4 
     5 --- openstack-openstacklib-6.1.0/metadata.json.orig   2015-10-15 09:31:01.371175733 -0700
     5 --- openstack-openstacklib-8.2.0/metadata.json.orig   2016-08-07 12:05:21.251224531 -0700
     6 +++ openstack-openstacklib-6.1.0/metadata.json       2015-10-15 09:31:40.878053925 -0700
     6 +++ openstack-openstacklib-8.2.0/metadata.json       2016-08-07 12:05:59.016560234 -0700
     7 @@ -11,8 +11,7 @@
     7 @@ -29,6 +29,13 @@
     8      {"name":"puppetlabs/apache","version_requirement":">=1.0.0 <2.0.0"},
     8        "operatingsystemrelease": [
     9      {"name":"puppetlabs/mysql","version_requirement":">=3.0.0 <4.0.0"},
       
    10      {"name":"puppetlabs/stdlib","version_requirement":">=4.0.0 <5.0.0"},
       
    11 -    {"name":"puppetlabs/rabbitmq","version_requirement":">=2.0.2 <6.0.0"},
       
    12 -    {"name":"puppetlabs/postgresql","version_requirement":">=3.3.0 <4.0.0"}
       
    13 +    {"name":"puppetlabs/rabbitmq","version_requirement":">=2.0.2 <6.0.0"}
       
    14    ],
       
    15    "requirements": [
       
    16      {
       
    17 @@ -50,6 +49,13 @@
       
    18          "12.04",
       
    19          "14.04"
     9          "14.04"
    20        ]
    10        ]
    21 +    },
    11 +    },
    22 +    {
    12 +    {
    23 +      "operatingsystem": "Solaris",
    13 +      "operatingsystem": "Solaris",
    24 +      "operatingsystemrelease": [
    14 +      "operatingsystemrelease": [
    25 +        "11.3",
    15 +        "12.0",
    26 +        "12.0"
    16 +        "11.3"
    27 +      ]
    17 +      ]
    28      }
    18      }
    29    ],
    19    ],
    30    "description": "Puppet module library to expose common functionality between OpenStack modules."
    20    "description": "Puppet module library to expose common functionality between OpenStack modules.",
       
    21 @@ -37,7 +44,6 @@
       
    22      {"name":"puppetlabs/inifile","version_requirement":">=1.4.0 <2.0.0"},
       
    23      {"name":"puppetlabs/mysql","version_requirement":">=3.6.0 <4.0.0"},
       
    24      {"name":"puppetlabs/stdlib","version_requirement":">=4.9.0 <5.0.0"},
       
    25 -    {"name":"puppetlabs/rabbitmq","version_requirement":">=5.3.1 <6.0.0"},
       
    26 -    {"name":"puppetlabs/postgresql","version_requirement":">=4.6.0 <5.0.0"}
       
    27 +    {"name":"puppetlabs/rabbitmq","version_requirement":">=5.3.1 <6.0.0"}
       
    28    ]
       
    29  }
    31 
    30 
    32 --- openstack-openstacklib-6.1.0/README.md.orig	2016-04-27 12:15:45.286079312 -0700
       
    33 +++ openstack-openstacklib-6.1.0/README.md	2016-04-27 12:15:54.419984548 -0700
       
    34 @@ -1,3 +1,5 @@
       
    35 +NOTE: Oracle has modified the originally distributed contents of metadata.json.
       
    36 +
       
    37  openstacklib
       
    38  ============
       
    39