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/proxy.pp.orig	2016-04-21 08:34:39.790662969 -0700
+++ openstack-swift-6.1.0/manifests/proxy.pp	2016-04-21 08:34:51.601941595 -0700
@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
+
 #
 # TODO - assumes that proxy server is always a memcached server
 #
@@ -173,16 +177,19 @@ class swift::proxy(
     fail ('log_udp_port requires log_udp_host to be set')
   }

-  package { 'swift-proxy':
-    ensure => $package_ensure,
-    name   => $::swift::params::proxy_package_name,
-    tag    => ['openstack', 'swift-package'],
+  if ( $swift::params::proxy_package_name != $swift::params::package_name ) {
+    ensure_packages([$swift::params::proxy_package_name],
+      {
+        ensure => $package_ensure,
+        name   => $::swift::params::proxy_package_name,
+        tag    => 'openstack',
+      }
+    )
   }

   concat { '/etc/swift/proxy-server.conf':
     owner   => 'swift',
     group   => 'swift',
-    require => Package['swift-proxy'],
   }

   $required_classes = split(