components/ruby/puppet-modules/openstack-glance/patches/04-registry.patch
changeset 6817 e4a26f447d0c
parent 6816 bb11bcf4ebf8
child 6818 4079d968549c
equal deleted inserted replaced
6816:bb11bcf4ebf8 6817:e4a26f447d0c
     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
       
     3 CI testing.
       
     4 
       
     5 --- openstack-glance-6.1.0/manifests/registry.pp.orig	2016-04-21 07:52:19.885897917 -0700
       
     6 +++ openstack-glance-6.1.0/manifests/registry.pp	2016-04-21 07:52:49.376252569 -0700
       
     7 @@ -1,3 +1,7 @@
       
     8 +#######################################################################
       
     9 +# Oracle has modified the originally distributed contents of this file.
       
    10 +#######################################################################
       
    11 +
       
    12  # == Class: glance::registry
       
    13  #
       
    14  # Installs and configures glance-registry
       
    15 @@ -171,7 +175,6 @@
       
    16      )
       
    17    }
       
    18  
       
    19 -  Package[$glance::params::registry_package_name] -> File['/etc/glance/']
       
    20    Package[$glance::params::registry_package_name] -> Glance_registry_config<||>
       
    21  
       
    22    Glance_registry_config<||> ~> Exec<| title == 'glance-manage db_sync' |>
       
    23 @@ -179,9 +182,6 @@
       
    24  
       
    25    File {
       
    26      ensure  => present,
       
    27 -    owner   => 'glance',
       
    28 -    group   => 'glance',
       
    29 -    mode    => '0640',
       
    30      notify  => Service['glance-registry'],
       
    31      require => Class['glance']
       
    32    }