diff --git a/manifests/common/authorized_keys.pp b/manifests/common/authorized_keys.pp index e8f5443a..175479bc 100644 --- a/manifests/common/authorized_keys.pp +++ b/manifests/common/authorized_keys.pp @@ -19,8 +19,8 @@ class authorized_keys ($keys, $account='root', $home = '') { # This line allows default homedir based on $account variable. # If $home is empty, the default is used. - $rhome = $account ? {'root' => '/root', default => $home} - $homedir = $rhome ? {'' => "/home/${account}", default => $rhome} + $rhome = $account ? {'root' => '/root', default => $home} + $homedir = $rhome ? {'' => "/home/${account}", default => $rhome} file { "${homedir}/.ssh": ensure => directory, owner => $ensure ? {'present' => $account, default => undef }, diff --git a/manifests/load-balancer/lb_server.pp b/manifests/load-balancer/lb_server.pp index 69d29cb0..c36a4b05 100644 --- a/manifests/load-balancer/lb_server.pp +++ b/manifests/load-balancer/lb_server.pp @@ -180,7 +180,7 @@ monitor fail if horizon_dead } 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 } } if $swift_api { diff --git a/manifests/network/network_controller.pp b/manifests/network/network_controller.pp index 28a4e58c..f1114f1b 100644 --- a/manifests/network/network_controller.pp +++ b/manifests/network/network_controller.pp @@ -53,7 +53,7 @@ class os_network_controller( # For later (when https://review.openstack.org/#/c/63228/ got merged) # 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 { 'securitygroup/firewall_driver': value => true; } diff --git a/manifests/object-storage/swift_storage.pp b/manifests/object-storage/swift_storage.pp index ecdc05f7..36736f80 100644 --- a/manifests/object-storage/swift_storage.pp +++ b/manifests/object-storage/swift_storage.pp @@ -47,13 +47,13 @@ class os_swift_storage ( Swift::Storage::Server { #devices => $devices, - storage_local_net_ip => $local_ip, - workers => inline_template('<%= @processorcount.to_i / 2 %>'), - replicator_concurrency => 2, - updater_concurrency => 1, - reaper_concurrency => 1, - require => Class['swift'], - mount_check => true, + storage_local_net_ip => $local_ip, + workers => inline_template('<%= @processorcount.to_i / 2 %>'), + replicator_concurrency => 2, + updater_concurrency => 1, + reaper_concurrency => 1, + require => Class['swift'], + mount_check => true, } # concurrency at 2 and 1 seems better see # http://docs.openstack.org/trunk/openstack-object-storage/admin/content/general-service-tuning.html