components/ruby/puppet-modules/openstack-glance/patches/05-api.patch
changeset 5860 afd31ba91ee9
parent 5464 6e2e17e6aa45
equal deleted inserted replaced
5859:98bc99958997 5860:afd31ba91ee9
     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-glance-6.1.0/manifests/api.pp.orig        2015-08-10 09:41:12.485497819 -0700
     5 --- openstack-glance-6.1.0/manifests/api.pp.orig	2016-04-21 07:53:25.924267344 -0700
     6 +++ openstack-glance-6.1.0/manifests/api.pp      2015-08-10 09:42:24.192123343 -0700
     6 +++ openstack-glance-6.1.0/manifests/api.pp	2016-04-21 07:53:40.217588163 -0700
     7 @@ -248,7 +248,6 @@ class glance::api(
     7 @@ -1,3 +1,7 @@
       
     8 +#######################################################################
       
     9 +# Oracle has modified the originally distributed contents of this file.
       
    10 +#######################################################################
       
    11 +
       
    12  # == Class glance::api
       
    13  #
       
    14  # Configure API service in glance
       
    15 @@ -248,7 +252,6 @@
     8      )
    16      )
     9    }
    17    }
    10 
    18  
    11 -  Package[$glance::params::api_package_name] -> File['/etc/glance/']
    19 -  Package[$glance::params::api_package_name] -> File['/etc/glance/']
    12    Package[$glance::params::api_package_name] -> Class['glance::policy']
    20    Package[$glance::params::api_package_name] -> Class['glance::policy']
    13    Package[$glance::params::api_package_name] -> Glance_api_config<||>
    21    Package[$glance::params::api_package_name] -> Glance_api_config<||>
    14    Package[$glance::params::api_package_name] -> Glance_cache_config<||>
    22    Package[$glance::params::api_package_name] -> Glance_cache_config<||>
    15 @@ -265,9 +264,6 @@ class glance::api(
    23 @@ -265,9 +268,6 @@
    16 
    24  
    17    File {
    25    File {
    18      ensure  => present,
    26      ensure  => present,
    19 -    owner   => 'glance',
    27 -    owner   => 'glance',
    20 -    group   => 'glance',
    28 -    group   => 'glance',
    21 -    mode    => '0640',
    29 -    mode    => '0640',