472253cbe2
Change I60fb78e5d40605ab47f349d154737ef9bab641f4 introduced a bug wherein /etc/swift/swift.conf is getting created in consolidated installs in which openstack::swift::proxy and openstack::swift::storage-node classes are both applied to the same server, but is not getting created on storage nodes in distributed installs in which the proxy and storage-node classes are applied to different servers. Use ensure_resource wrappers around the swift class call to correct. Change-Id: I692ddf5f344577705fc6a8652349f480ad21542d Closes-Bug: 1287349
57 lines
1.5 KiB
Puppet
57 lines
1.5 KiB
Puppet
class openstack::swift::storage-node (
|
|
$swift_zone,
|
|
$ring_server,
|
|
$swift_hash_suffix = 'swift_secret',
|
|
$swift_local_net_ip = $::ipaddress_eth0,
|
|
$storage_type = 'loopback',
|
|
$storage_base_dir = '/srv/loopback-device',
|
|
$storage_mnt_base_dir = '/srv/node',
|
|
$storage_devices = ['1', '2'],
|
|
$storage_weight = 1,
|
|
$package_ensure = 'present',
|
|
$byte_size = '1024',
|
|
) {
|
|
|
|
ensure_resource('class', 'swift',
|
|
{ swift_hash_suffix => $swift_hash_suffix,
|
|
package_ensure => $package_ensure,
|
|
}
|
|
)
|
|
|
|
case $storage_type {
|
|
'loopback': {
|
|
# create xfs partitions on a loopback device and mount them
|
|
swift::storage::loopback { $storage_devices:
|
|
base_dir => $storage_base_dir,
|
|
mnt_base_dir => $storage_mnt_base_dir,
|
|
require => Class['swift'],
|
|
}
|
|
}
|
|
# make xfs filesystem on physical disk and mount them
|
|
'disk': {
|
|
swift::storage::disk {$storage_devices:
|
|
mnt_base_dir => $storage_mnt_base_dir,
|
|
byte_size => $byte_size,
|
|
}
|
|
}
|
|
default: {
|
|
}
|
|
}
|
|
|
|
# install all swift storage servers together
|
|
class { 'swift::storage::all':
|
|
storage_local_net_ip => $swift_local_net_ip,
|
|
}
|
|
|
|
openstack::swift::device_endpoint { $storage_devices:
|
|
swift_local_net_ip => $swift_local_net_ip,
|
|
zone => $swift_zone,
|
|
weight => $storage_weight,
|
|
}
|
|
|
|
# rsync rings from the ring server
|
|
swift::ringsync { ['account','container','object']:
|
|
ring_server => $ring_server,
|
|
}
|
|
}
|