Merge "Ensure swift ring sync after its packages installed"
This commit is contained in:
commit
31debf9512
@ -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": }
|
||||
|
@ -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']]],
|
||||
# }
|
||||
}
|
||||
|
@ -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',
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user