stackforge/puppet-openstack-cloud
Code Issues Proposed changes

lint: Fix all ERRORS

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2013-12-28 21:56:25 +01:00
parent 5b95a60611
commit fbdd686133
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/common/authorized_keys.pp
View File

@@ -19,8 +19,8 @@
class authorized_keys ($keys, $account='root', $home = '') { class authorized_keys ($keys, $account='root', $home = '') {
# This line allows default homedir based on $account variable. # This line allows default homedir based on $account variable.
# If $home is empty, the default is used. # If $home is empty, the default is used.
$rhome = $account ? {'root' => '/root', default => $home} $rhome = $account ? {'root' => '/root', default => $home}
$homedir = $rhome ? {'' => "/home/${account}", default => $rhome} $homedir = $rhome ? {'' => "/home/${account}", default => $rhome}
file { "${homedir}/.ssh": file { "${homedir}/.ssh":
ensure => directory, ensure => directory,
owner => $ensure ? {'present' => $account, default => undef }, owner => $ensure ? {'present' => $account, default => undef },

2
manifests/load-balancer/lb_server.pp
View File

@@ -180,7 +180,7 @@ monitor fail if horizon_dead
} }
if $keystone { if $keystone {
os_haproxy_listen_http { 'keystone_api_cluster': ports => $ks_keystone_public_port } os_haproxy_listen_http { 'keystone_api_cluster': ports => $ks_keystone_public_port }
os_haproxy_listen_http { 'keystone_api_admin_cluster': ports => $ks_keystone_admin_port } os_haproxy_listen_http { 'keystone_api_admin_cluster': ports => $ks_keystone_admin_port }
} }
if $swift_api { if $swift_api {

2
manifests/network/network_controller.pp
View File

@@ -53,7 +53,7 @@ class os_network_controller(
# For later (when https://review.openstack.org/#/c/63228/ got merged) # For later (when https://review.openstack.org/#/c/63228/ got merged)
# enable_security_group => true # enable_security_group => true
} }
# While https://review.openstack.org/#/c/63228/ is not merged: # While https://review.openstack.org/#/c/63228/ is not merged:
neutron_plugin_ml2 { neutron_plugin_ml2 {
'securitygroup/firewall_driver': value => true; 'securitygroup/firewall_driver': value => true;
} }

14
manifests/object-storage/swift_storage.pp
View File

@@ -47,13 +47,13 @@ class os_swift_storage (
Swift::Storage::Server { Swift::Storage::Server {
#devices => $devices, #devices => $devices,
storage_local_net_ip => $local_ip, storage_local_net_ip => $local_ip,
workers => inline_template('<%= @processorcount.to_i / 2 %>'), workers => inline_template('<%= @processorcount.to_i / 2 %>'),
replicator_concurrency => 2, replicator_concurrency => 2,
updater_concurrency => 1, updater_concurrency => 1,
reaper_concurrency => 1, reaper_concurrency => 1,
require => Class['swift'], require => Class['swift'],
mount_check => true, mount_check => true,
} }
# concurrency at 2 and 1 seems better see # concurrency at 2 and 1 seems better see
# http://docs.openstack.org/trunk/openstack-object-storage/admin/content/general-service-tuning.html # http://docs.openstack.org/trunk/openstack-object-storage/admin/content/general-service-tuning.html