In-house patch to add support for Solaris 11.3 and 12.0. This patch

has not yet been submitted upstream due to requirements for 3rd party

CI testing.

--- openstack-swift-6.1.0/manifests/storage/account.pp.orig 2016-04-21 08:40:58.647841720 -0700

+++ openstack-swift-6.1.0/manifests/storage/account.pp 2016-04-21 08:41:37.781959002 -0700

@@ -1,3 +1,7 @@

+#######################################################################

+# Oracle has modified the originally distributed contents of this file.

+#######################################################################

+

# Class swift::storage::account

#

# == Parameters

@@ -58,7 +62,6 @@ class swift::storage::account(

enabled => $enabled,

config_file_name => $config_file_name,

service_provider => $service_provider,

- require => Package['swift-account'],

subscribe => File["/etc/swift/${config_file_name}"],

}

}

--- openstack-swift-6.1.0/manifests/storage/container.pp.orig 2016-04-21 08:41:03.411182222 -0700

+++ openstack-swift-6.1.0/manifests/storage/container.pp 2016-04-21 08:41:41.863686954 -0700

@@ -1,3 +1,7 @@

+#######################################################################

+# Oracle has modified the originally distributed contents of this file.

+#######################################################################

+

# Class swift::storage::container

#

# === Parameters

@@ -64,7 +68,6 @@ class swift::storage::container(

enabled => $enabled,

config_file_name => $config_file_name,

service_provider => $service_provider,

- require => Package['swift-container'],

subscribe => File["/etc/swift/${config_file_name}"],

}

@@ -75,7 +78,6 @@ class swift::storage::container(

enabled => $enabled,

config_file_name => $config_file_name,

service_provider => $service_provider,

- require => Package['swift-container'],

subscribe => File["/etc/swift/${config_file_name}"],

}

Swift_config<| |> ~> Service['swift-container-sync']

--- openstack-swift-6.1.0/manifests/storage/object.pp.orig 2016-04-21 08:41:08.181529232 -0700

+++ openstack-swift-6.1.0/manifests/storage/object.pp 2016-04-21 08:41:44.966394780 -0700

+#######################################################################

+# Oracle has modified the originally distributed contents of this file.

+#######################################################################

+

# Class swift::storage::object

#

# == Parameters

@@ -58,7 +62,6 @@ class swift::storage::object(

enabled => $enabled,

config_file_name => $config_file_name,

service_provider => $service_provider,

- require => Package['swift-object'],

subscribe => File["/etc/swift/${config_file_name}"],

}

}

--- openstack-swift-6.1.0/manifests/storage/generic.pp.orig 2016-04-21 08:41:14.272088204 -0700

+++ openstack-swift-6.1.0/manifests/storage/generic.pp 2016-04-21 08:41:48.797848159 -0700

@@ -1,3 +1,7 @@

+#######################################################################

+# Oracle has modified the originally distributed contents of this file.

+#######################################################################

+

# Creates the files packages and services that are

# needed to deploy each type of storage server.

#

@@ -47,20 +51,6 @@ define swift::storage::generic(

validate_re($name, '^object|container|account$')

- package { "swift-${name}":

- ensure => $package_ensure,

- name => getvar("::swift::params::${name}_package_name"),

- tag => ['openstack', 'swift-package'],

- before => Service["swift-${name}-server", "swift-${name}-replicator"],

- }

-

- file { "/etc/swift/${name}-server/":

- ensure => directory,

- owner => 'swift',

- group => 'swift',

- require => Package["swift-${name}"],

- }

-

if $manage_service {

if $enabled {

$service_ensure = 'running'

@@ -75,7 +65,6 @@ define swift::storage::generic(

enabled => $enabled,

config_file_name => $config_file_name,

service_provider => $service_provider,

- subscribe => Package["swift-${name}"],

}

swift::service { "swift-${name}-replicator":

@@ -84,7 +73,6 @@ define swift::storage::generic(

enabled => $enabled,

config_file_name => $config_file_name,

service_provider => $service_provider,

- subscribe => Package["swift-${name}"],

}

swift::service { "swift-${name}-auditor":

@@ -93,6 +81,5 @@ define swift::storage::generic(

enabled => $enabled,

config_file_name => $config_file_name,

service_provider => $service_provider,

- subscribe => Package["swift-${name}"],

}

}