stackforge/puppet-openstack-cloud
Code Issues Proposed changes

swift: move class

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2013-12-30 10:41:45 +01:00
parent dc279ce8cb
commit 8edee188d0
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/object-storage/swift_common.pp → manifests/object.pp
View File

@ -16,7 +16,7 @@
# Swift nodes
#
class os_swift_common(
class privatecloud::object(
$swift_hash_suffix = $os_params::swift_hash_suffix
) {
@ -26,6 +26,6 @@ class os_swift_common(
swift_hash_suffix => $swift_hash_suffix,
}
class {'os_swift_system::tweaking': }
class {'privatecloud::object::tweaking': }
}

4
manifests/object-storage/swift_proxy.pp → manifests/object/controller.pp
View File

@ -16,7 +16,7 @@
# Swift Proxy node
#
class os_swift_proxy(
class privatecloud::object::controller(
$ks_keystone_admin_host = $os_params::ks_keystone_admin_host,
$ks_keystone_admin_port = $os_params::ks_keystone_admin_port,
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
@ -27,7 +27,7 @@ class os_swift_proxy(
$statsd_host = $os_params::statsd_host,
$statsd_port = $os_params::statsd_port,
$swift_memchached = $os_params::swift_memchached
) inherits os_swift_common {
) {
class { 'swift::proxy':
proxy_local_net_ip => $ipaddress_eth0,

4
manifests/object-storage/swift_ringbuiler.pp → manifests/object/ringbuilder.pp
View File

@ -16,11 +16,11 @@
# Swift ring builder node
#
class os_swift_ringbuilder(
class privatecloud::object::ringbuilder(
$rsyncd_ipaddress = ipaddress_eth0,
$replicas = $os_params::replicas,
$swift_rsync_max_connections = $os_params::swift_rsync_max_connections,
) inherits os_swift_common {
) {
Ring_object_device <<| |>>
Ring_container_device <<| |>>

4
manifests/object-storage/swift_storage.pp → manifests/object/storage.pp
View File

@ -27,14 +27,14 @@ define set_io_scheduler(){
}
# swift storage
class os_swift_storage (
class privatecloud::object::storage (
$local_ip = $ipaddress_eth0,
$swift_zone = undef,
$object_port = '6000',
$container_port = '6001',
$account_port = '6002',
$onloopdevices = false,
) inherits os_swift_common {
) {
class { 'swift::storage':
storage_local_net_ip => $local_ip,

2
manifests/object-storage/swift_tweaking.pp → manifests/object/tweaking.pp
View File

@ -16,7 +16,7 @@
# Swift tweaking
#
class os_swift_system::tweaking {
class privatecloud::object::tweaking {
file {'/etc/sysctl.d/swift-tuning.conf':
content => "
# disable TIME_WAIT.. wait..