openstack
/
fuel-library
Code Issues Proposed changes

Merge "Add a new swift_backups section in rsync conf"

This commit is contained in:
Jenkins 2016-02-08 17:11:07 +00:00 committed by Gerrit Code Review
parent 75f669480d 1a5e0e726f
commit 9b1df9e7ab
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deployment/puppet/openstack/manifests/swift/proxy.pp
View File

@ -173,6 +173,17 @@ class openstack::swift::proxy (
local_net_ip => $swift_replication_local_ipaddr,
}
rsync::server::module { 'swift_backups':
path => '/etc/swift/backups',
lock_file => '/var/lock/swift_backups.lock',
uid => 'swift',
gid => 'swift',
incoming_chmod => false,
outgoing_chmod => false,
max_connections => '5',
read_only => true,
}
# resource ordering
Swift::Ringbuilder::Rebalance <||> -> Service['swift-proxy-server']
Swift::Ringbuilder::Rebalance <||> -> Swift::Storage::Generic <| |>
@ -195,7 +206,7 @@ class openstack::swift::proxy (
}
rsync::get { "/etc/swift/backups/":
source => "rsync://${master_swift_replication_ip}/swift_server/backups/",
source => "rsync://${master_swift_replication_ip}/swift_backups/",
recursive => true,
}

13
tests/noop/spec/hosts/swift/swift_spec.rb
View File

@ -216,6 +216,19 @@ describe manifest do
'identity_uri' => identity_uri,
)
end
it 'should contain swift backups section in rsync conf' do
should contain rsync__server__module('swift_backups').with(
'path' => '/etc/swift/backups',
'lock_file' => '/var/lock/swift_backups.lock',
'uid' => 'swift',
'gid' => 'swift',
'incoming_chmod' => false,
'outgoing_chmod' => false,
'max_connections' => '5',
'read_only' => true,
)
end
end
end
test_ubuntu_and_centos manifest