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/init.pp.orig     2015-08-10 11:12:30.293187329 -0700

     6 +++ openstack-swift-6.1.0/manifests/init.pp     2015-08-10 11:13:32.086133292 -0700

     7 @@ -2,6 +2,10 @@

     8  #

     9  # == Parameters

    10  #

    11 +# [*swift_hash_prefix*] string of text to be used

    12 +#   as a salt when hashing to determine mappings in the ring.

    13 +#   This file should be the same on every node in the cluster.

    14 +#

    15  # [*swift_hash_suffix*] string of text to be used

    16  #   as a salt when hashing to determine mappings in the ring.

    17  #   This file should be the same on every node in the cluster.

    18 @@ -29,6 +33,7 @@

    19  # Copyright 2011 Puppetlabs Inc, unless otherwise noted.

    20  #

    21  class swift(

    22 +  $swift_hash_prefix,

    23    $swift_hash_suffix,

    24    $package_ensure        = 'present',

    25    $client_package_ensure = 'present',

    26 @@ -49,27 +54,9 @@ class swift(

    27      ensure => $client_package_ensure;

    28    }

    29 

    30 -  File { owner => 'swift', group => 'swift', require => Package['swift'] }

    31 -

    32 -  file { '/etc/swift':

    33 -    ensure => directory,

    34 -    mode   => '2770',

    35 -  }

    36 -  user {'swift':

    37 -    ensure => present,

    38 -  }

    39 -  file { '/var/lib/swift':

    40 -    ensure => directory,

    41 -  }

    42 -  file { '/var/run/swift':

    43 -    ensure => directory,

    44 -  }

    45 -

    46 -  file { '/etc/swift/swift.conf':

    47 -    ensure => file,

    48 -    mode   => '0660',

    49 +  swift_config { 'swift-hash/swift_hash_path_prefix':

    50 +    value => $swift_hash_prefix,

    51    }

    52 -

    53    swift_config { 'swift-hash/swift_hash_path_suffix':

    54      value => $swift_hash_suffix,

    55    }