components/ruby/puppet-modules/openstack-swift/patches/04-proxy.patch
branchs11u3-sru
changeset 6035 c9748fcc32de
child 5860 afd31ba91ee9
equal deleted inserted replaced
6016:a477397bba8b 6035:c9748fcc32de
       
     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-swift-6.1.0/manifests/proxy.pp.orig	2015-09-14 13:10:38.379095262 +0100
       
     6 +++ openstack-swift-6.1.0/manifests/proxy.pp	2015-09-14 13:11:32.939063467 +0100
       
     7 @@ -167,17 +167,20 @@
       
     8      fail ('log_udp_port requires log_udp_host to be set')
       
     9    }
       
    10  
       
    11 -  package { 'swift-proxy':
       
    12 -    ensure => $package_ensure,
       
    13 -    name   => $::swift::params::proxy_package_name,
       
    14 -    tag    => 'openstack',
       
    15 +  if ( $swift::params::proxy_package_name != $swift::params::package_name ) {
       
    16 +    ensure_packages([$swift::params::proxy_package_name],
       
    17 +      {
       
    18 +        ensure => $package_ensure,
       
    19 +        name   => $::swift::params::proxy_package_name,
       
    20 +        tag    => 'openstack',
       
    21 +      }
       
    22 +    )
       
    23    }
       
    24  
       
    25    concat { '/etc/swift/proxy-server.conf':
       
    26      owner   => 'swift',
       
    27      group   => 'swift',
       
    28      mode    => '0660',
       
    29 -    require => Package['swift-proxy'],
       
    30    }
       
    31  
       
    32    $required_classes = split(