stackforge/puppet-openstack-cloud
Code Issues Proposed changes

[object/storage] Fix module layout

Browse Source
This commit is contained in:
Sebastien Badia 2014-01-22 18:15:20 +01:00
parent 18a57d7002
commit 6799c1b6ba
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/object/set_io_scheduler.pp Normal file
View File

@ -0,0 +1,26 @@
#
# Copyright (C) 2014 eNovance SAS <licensing@enovance.com>
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# 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 set_io_scheduler
#
define cloud::object::set_io_scheduler(){
# TODO: Add it on server boot
exec{"/bin/echo deadline > /sys/block/${name}/queue/scheduler":
onlyif => [
"/usr/bin/test '-e /sys/block/${name}/queue/scheduler'",
"/bin/grep -v -F '[deadline]' /sys/block/${name}/queue/scheduler"
],
}
}

15
manifests/object/storage.pp
View File

@ -15,16 +15,7 @@
#
# Swift Storage node
#
define set_io_scheduler(){
# TODO: Add it on server boot
exec{"/bin/echo deadline > /sys/block/${name}/queue/scheduler":
onlyif => [
"/usr/bin/test '-e /sys/block/${name}/queue/scheduler'",
"/bin/grep -v -F '[deadline]' /sys/block/${name}/queue/scheduler"
],
}
}
import 'set_io_scheduler.pp'
# swift storage
class cloud::object::storage (
@ -95,8 +86,8 @@ allow_versions = on
$object_nodes = flatten([ range('sdc','sdd')])
swift::storage::xfs { $object_nodes: }
swift::storage::xfs { 'sdb': }
set_io_scheduler{'sdb':}
set_io_scheduler{$object_nodes:}
cloud::object::set_io_scheduler {'sdb':}
cloud::object::set_io_scheduler {$object_nodes:}
@@ring_container_device { "${storage_eth}:${container_port}/sdb":
zone => $swift_zone,