components/ruby/puppet-modules/openstack-swift/patches/04-proxy.patch
changeset 6817 e4a26f447d0c
parent 5860 afd31ba91ee9
--- a/components/ruby/puppet-modules/openstack-swift/patches/04-proxy.patch	Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/04-proxy.patch	Wed Sep 07 14:48:35 2016 -0700
@@ -12,14 +12,14 @@
  #
  # TODO - assumes that proxy server is always a memcached server
  #
-@@ -167,17 +171,20 @@
+@@ -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',
+-    tag    => ['openstack', 'swift-package'],
 +  if ( $swift::params::proxy_package_name != $swift::params::package_name ) {
 +    ensure_packages([$swift::params::proxy_package_name],
 +      {
@@ -29,12 +29,11 @@
 +      }
 +    )
    }
- 
+
    concat { '/etc/swift/proxy-server.conf':
      owner   => 'swift',
      group   => 'swift',
-     mode    => '0660',
 -    require => Package['swift-proxy'],
    }
- 
+
    $required_classes = split(