From dfa66f9d331d88d08cf7d08668de6535e197d416 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Sat, 2 Nov 2013 14:45:21 +0100 Subject: [PATCH] Swift: cleanup Signed-off-by: Emilien Macchi --- roles/object-storage/swift_common.pp | 5 +++-- roles/object-storage/swift_proxy.pp | 7 ++++--- roles/object-storage/swift_ringbuiler.pp | 8 ++++---- roles/object-storage/swift_storage.pp | 8 ++++---- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/roles/object-storage/swift_common.pp b/roles/object-storage/swift_common.pp index 441220ea..33271e47 100644 --- a/roles/object-storage/swift_common.pp +++ b/roles/object-storage/swift_common.pp @@ -16,10 +16,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - +# # Swift nodes +# -class os_role_swift { +class os_swift_common { class { 'ssh::server::install': } diff --git a/roles/object-storage/swift_proxy.pp b/roles/object-storage/swift_proxy.pp index 2219b42a..e88a57d6 100644 --- a/roles/object-storage/swift_proxy.pp +++ b/roles/object-storage/swift_proxy.pp @@ -16,12 +16,13 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - +# # Swift Proxy node +# -class os_role_swift_proxy( +class os_swift_proxy( $local_ip = $ipaddress_eth0, -) inherits os_role_swift { +) inherits os_swift_common { class { 'memcached': listen_ip => $local_ip, diff --git a/roles/object-storage/swift_ringbuiler.pp b/roles/object-storage/swift_ringbuiler.pp index 70f6b7d1..747e2d34 100644 --- a/roles/object-storage/swift_ringbuiler.pp +++ b/roles/object-storage/swift_ringbuiler.pp @@ -16,14 +16,14 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - +# # Swift ring builder node +# - -class os_role_swift_ringbuilder( +class os_swift_ringbuilder( $rsyncd_ipaddress = ipaddress_eth0, $replicas = 3 -) inherits os_role_swift { +) inherits os_swift_common { Ring_object_device <<| |>> Ring_container_device <<| |>> diff --git a/roles/object-storage/swift_storage.pp b/roles/object-storage/swift_storage.pp index b4554f4d..b6939090 100644 --- a/roles/object-storage/swift_storage.pp +++ b/roles/object-storage/swift_storage.pp @@ -16,9 +16,9 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - +# # Swift Storage node - +# define set_io_scheduler(){ # TODO: Add it on server boot @@ -31,14 +31,14 @@ define set_io_scheduler(){ } -class os_role_swift_storage ( +class os_swift_storage ( $local_ip = $ipaddress_eth0, $swift_zone = undef, $object_port = '6000', $container_port = '6001', $account_port = '6002', $onloopdevices = false, -) inherits os_role_swift { +) inherits os_swift_common { class { 'swift::storage': storage_local_net_ip => $local_ip,