From 5e56a864e60a2952b1e20888ba4acd5f8243da12 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Wed, 22 Jan 2014 18:12:54 +0100 Subject: [PATCH 1/4] [telemetry/server] Proper escape $RANDOM variable Fix ceilometer-expirer command. Close: #32 --- manifests/telemetry/server.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/telemetry/server.pp b/manifests/telemetry/server.pp index 7d07a3b0..1715d266 100644 --- a/manifests/telemetry/server.pp +++ b/manifests/telemetry/server.pp @@ -68,7 +68,7 @@ class cloud::telemetry::server( hour => '0', } - Cron <| title == 'ceilometer-expirer' |> { command => "sleep $(($RANDOM % 86400)) && ${::ceilometer::params::expirer_command}" } + Cron <| title == 'ceilometer-expirer' |> { command => "sleep $((\$RANDOM % 86400)) && ${::ceilometer::params::expirer_command}" } @@haproxy::balancermember{"${::fqdn}-ceilometer_api": listening_service => 'ceilometer_api_cluster', From 18a57d7002ac07bc86ddf6c3c6eeeaa45d9d2d43 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Wed, 22 Jan 2014 18:14:33 +0100 Subject: [PATCH 2/4] [indentity] Fix missing variable (scope) --- manifests/identity.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/identity.pp b/manifests/identity.pp index 3490dd11..f6296771 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -343,6 +343,7 @@ class cloud::identity ( $ks_glance_password = $os_params::ks_glance_password, $ks_glance_public_host = $os_params::ks_glance_public_host, $ks_glance_public_proto = $os_params::ks_glance_public_proto, + $ks_glance_public_port = $os_params::ks_glance_public_port, $ks_heat_admin_host = $os_params::ks_heat_admin_host, $ks_heat_internal_host = $os_params::ks_heat_internal_host, $ks_heat_password = $os_params::ks_heat_password, From 6799c1b6ba9f51187a2eff805d5ea73fcae49dde Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Wed, 22 Jan 2014 18:15:20 +0100 Subject: [PATCH 3/4] [object/storage] Fix module layout --- manifests/object/set_io_scheduler.pp | 26 ++++++++++++++++++++++++++ manifests/object/storage.pp | 15 +++------------ 2 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 manifests/object/set_io_scheduler.pp diff --git a/manifests/object/set_io_scheduler.pp b/manifests/object/set_io_scheduler.pp new file mode 100644 index 00000000..8f0d0a7a --- /dev/null +++ b/manifests/object/set_io_scheduler.pp @@ -0,0 +1,26 @@ +# +# Copyright (C) 2014 eNovance SAS +# +# 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" + ], + } +} diff --git a/manifests/object/storage.pp b/manifests/object/storage.pp index 7954c1f7..8512a354 100644 --- a/manifests/object/storage.pp +++ b/manifests/object/storage.pp @@ -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, From 56fa828304be9016dedbf159dbf62d383532157a Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Wed, 22 Jan 2014 18:15:47 +0100 Subject: [PATCH 4/4] Rakefile: Re-enable lint checks --- Rakefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Rakefile b/Rakefile index 7a515d95..68f41bb5 100644 --- a/Rakefile +++ b/Rakefile @@ -4,12 +4,7 @@ require 'puppet-lint/tasks/puppet-lint' PuppetLint.configuration.fail_on_warnings = true PuppetLint.configuration.send('disable_80chars') PuppetLint.configuration.send('disable_class_parameter_defaults') -PuppetLint.configuration.send('disable_autoloader_layout') -PuppetLint.configuration.send('disable_variable_scope') -PuppetLint.configuration.send('disable_nested_classes_or_defines') -PuppetLint.configuration.send('disable_selector_inside_resource') PuppetLint.configuration.ignore_paths = ['spec/fixtures/modules/**/*.pp'] task(:default).clear task :default => [:spec_prep, :spec_standalone, :lint] -