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/ringserver.pp.orig 2016-04-21 08:35:45.020733168 -0700
+++ openstack-swift-6.1.0/manifests/ringserver.pp 2016-04-21 08:36:15.081896515 -0700
@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
+
# == Class: swift::ringserver
#
# Used to create an rsync server to serve up the ring databases via rsync
@@ -32,20 +36,9 @@ class swift::ringserver(
Class['swift::ringbuilder'] -> Class['swift::ringserver']
- if !defined(Class['rsync::server']) {
- class { '::rsync::server':
- use_xinetd => true,
- address => $local_net_ip,
- use_chroot => 'no',
+ if !defined(Service['application/openstack/swift/swift-replicator-rsync']) {
+ service { 'application/openstack/swift/swift-replicator-rsync':
+ ensure => 'running',
}
}
-
- rsync::server::module { 'swift_server':
- path => '/etc/swift',
- lock_file => '/var/lock/swift_server.lock',
- uid => 'swift',
- gid => 'swift',
- max_connections => $max_connections,
- read_only => true,
- }
}
--- openstack-swift-6.1.0/manifests/storage.pp.orig 2016-04-21 08:35:49.421176646 -0700
+++ openstack-swift-6.1.0/manifests/storage.pp 2016-04-21 08:36:21.531668180 -0700
@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
+
#
# Configures dependencies that are common for all storage
# types.
@@ -23,11 +27,9 @@
$storage_local_net_ip
) {
- if !defined(Class['rsync::server']){
- class{ '::rsync::server':
- use_xinetd => true,
- address => $storage_local_net_ip,
- use_chroot => 'no',
+ if !defined(Service['application/openstack/swift/swift-replicator-rsync']) {
+ service { 'application/openstack/swift/swift-replicator-rsync':
+ ensure => 'running',
}
}
}
--- openstack-swift-6.1.0/manifests/storage/server.pp.orig 2016-04-21 08:35:54.242984740 -0700
+++ openstack-swift-6.1.0/manifests/storage/server.pp 2016-04-21 08:36:24.979535088 -0700
@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
+
# == Define: swift::storage::server
#
# Configures an account, container or object server
@@ -165,17 +169,6 @@
$bind_port = $name
- rsync::server::module { $type:
- path => $devices,
- lock_file => "/var/lock/${type}.lock",
- uid => $owner,
- gid => $group,
- incoming_chmod => $incoming_chmod,
- outgoing_chmod => $outgoing_chmod,
- max_connections => $max_connections,
- read_only => false,
- }
-
concat { "/etc/swift/${config_file_path}":
owner => $owner,
group => $group,