From fc7822afd3d0de02e7e205b227dd8258943af5a1 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobrelia@mirantis.com>
Date: Fri, 22 Aug 2014 15:31:11 +0300
Subject: [PATCH] Ensure swift ring sync after its packages installed

Closes-bug: #1360118

Change-Id: Ia667f2fd8de16144c25a4f5cc9e849e4d2c69797
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
---
 .../puppet/openstack/manifests/glance.pp      |  3 ++-
 deployment/puppet/swift/manifests/init.pp     | 20 +------------------
 deployment/puppet/swift/manifests/proxy.pp    |  1 +
 .../puppet/swift/manifests/storage/generic.pp |  1 +
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/deployment/puppet/openstack/manifests/glance.pp b/deployment/puppet/openstack/manifests/glance.pp
index b6bdeba007..68242c701a 100644
--- a/deployment/puppet/openstack/manifests/glance.pp
+++ b/deployment/puppet/openstack/manifests/glance.pp
@@ -208,7 +208,8 @@ class openstack::glance (
           ensure =>present
         }
       }
-      Package["swift"] ~> Service['glance-api']
+      Package['swift'] ~> Service['glance-api']
+      Package['swift'] -> Swift::Ringsync <||>
       Package<| title == 'swift'|> ~> Service<| title == 'glance-api'|>
       if !defined(Service['glance-api']) {
         notify{ "Module ${module_name} cannot notify service glance-api on package swift update": }
diff --git a/deployment/puppet/swift/manifests/init.pp b/deployment/puppet/swift/manifests/init.pp
index 790f7d87ba..5d11b0aadc 100644
--- a/deployment/puppet/swift/manifests/init.pp
+++ b/deployment/puppet/swift/manifests/init.pp
@@ -39,6 +39,7 @@ class swift(
       ensure => $package_ensure,
       name   => $::swift::params::package_name,
     }
+    Package['swift'] -> Swift::Ringsync <||>
   }
 
   File { owner => 'swift', group => 'swift', require => Package['swift'] }
@@ -71,7 +72,6 @@ class swift(
     group  => 'swift'
   }
 
-
   file { '/var/run/swift':
     ensure => directory,
   }
@@ -81,22 +81,4 @@ class swift(
     mode    => '0660',
     content => template('swift/swift.conf.erb'),
   }
-
-#  file { "/tmp/swift-utils.patch":
-#    ensure => present,
-#    source => 'puppet:///modules/swift/swift-utils.patch'
-#  }
-#
-#  if !defined(Package['patch']) {
-#    package {'patch': ensure => present }
-#  }
-#
-#  exec { 'patch-swift-utils':
-#    path    => ["/usr/bin", "/usr/sbin"],
-#    command => "/usr/bin/patch -p1 -N -r - -d \
-#                /usr/lib/${::swift::params::python_path}/swift/common/ \
-#                </tmp/swift-utils.patch",
-#    returns => [0, 1],
-#    require => [ [File['/tmp/swift-utils.patch']],[Package['patch', 'swift']]],
-#  }
 }
diff --git a/deployment/puppet/swift/manifests/proxy.pp b/deployment/puppet/swift/manifests/proxy.pp
index baebeb4826..3955f45036 100644
--- a/deployment/puppet/swift/manifests/proxy.pp
+++ b/deployment/puppet/swift/manifests/proxy.pp
@@ -86,6 +86,7 @@ class swift::proxy(
     name   => $::swift::params::proxy_package_name,
     ensure => $package_ensure,
   }
+  Package['swift-proxy'] -> Swift::Ringsync <||>
 
   concat { '/etc/swift/proxy-server.conf':
     owner   => 'swift',
diff --git a/deployment/puppet/swift/manifests/storage/generic.pp b/deployment/puppet/swift/manifests/storage/generic.pp
index 188dedce3a..59f83ca6f1 100644
--- a/deployment/puppet/swift/manifests/storage/generic.pp
+++ b/deployment/puppet/swift/manifests/storage/generic.pp
@@ -41,6 +41,7 @@ define swift::storage::generic(
   if !defined(Service["swift-${name}-replicator"]) {
     notify{ "Module ${module_name} cannot notify service swift-${name}-replicator on package update": }
   }
+  Package["swift-${name}"] -> Swift::Ringsync <||>
 
   file { "/etc/swift/${name}-server/":
     ensure => directory,