components/ruby/puppet-modules/openstack-swift/patches/05-remove-rsync-server.patch
--- a/components/ruby/puppet-modules/openstack-swift/patches/05-remove-rsync-server.patch Mon Apr 25 10:20:40 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/05-remove-rsync-server.patch Wed Apr 27 14:55:10 2016 -0700
@@ -2,12 +2,20 @@
has not yet been submitted upstream due to requirements for 3rd party
CI testing.
---- openstack-swift-6.1.0/manifests/ringserver.pp.orig 2015-10-15 08:03:54.000000000 -0700
-+++ openstack-swift-6.1.0/manifests/ringserver.pp 2015-11-02 09:49:22.778783205 -0800
-@@ -32,20 +32,9 @@ class swift::ringserver(
-
+--- 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::ringbuilder'] -> Class['swift::ringserver']
-
+
- if !defined(Class['rsync::server']) {
- class { '::rsync::server':
- use_xinetd => true,
@@ -28,13 +36,20 @@
- read_only => true,
- }
}
-
---- openstack-swift-6.1.0/manifests/storage.pp.orig 2015-10-15 08:03:54.000000000 -0700
-+++ openstack-swift-6.1.0/manifests/storage.pp 2015-11-02 09:46:53.798720245 -0800
-@@ -23,11 +23,9 @@ class swift::storage(
+--- 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,
@@ -46,13 +61,20 @@
}
}
}
-
---- openstack-swift-6.1.0/manifests/storage/server.pp.orig 2015-11-02 09:51:04.785489361 -0800
-+++ openstack-swift-6.1.0/manifests/storage/server.pp 2015-11-02 09:51:16.912645480 -0800
-@@ -165,17 +165,6 @@ define swift::storage::server(
-
+--- 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",