stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Various Puppet lint fixes"

Browse Source
This commit is contained in:
Jenkins
2013-07-06 02:05:32 +00:00
committed by Gerrit Code Review
parent de4062022f 394e614ab2
commit ba30b19af8
15 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/all.pp
View File

@@ -237,7 +237,7 @@ class openstack::all (
if $glance_api_servers { if $glance_api_servers {
$glance_api_servers_real = $glance_api_servers $glance_api_servers_real = $glance_api_servers
} else { } else {
$glance_api_servers_real = "$internal_address_real:9292" $glance_api_servers_real = "${internal_address_real}:9292"
} }
@@ -445,7 +445,7 @@ class openstack::all (
} else { } else {
if ! $fixed_range { if ! $fixed_range {
fail("Must specify the fixed range when using nova-networks") fail('Must specify the fixed range when using nova-networks')
} }
if $multi_host { if $multi_host {

2
manifests/auth_file.pp
View File

@@ -9,7 +9,7 @@ class openstack::auth_file(
$keystone_admin_token = 'keystone_admin_token', $keystone_admin_token = 'keystone_admin_token',
$admin_user = 'admin', $admin_user = 'admin',
$admin_tenant = 'admin', $admin_tenant = 'admin',
$use_no_cache = 'true' $use_no_cache = true
) { ) {
file { '/root/openrc': file { '/root/openrc':
content => content =>

12
manifests/client.pp
View File

@@ -32,26 +32,26 @@ class openstack::client (
) { ) {
if $ceilometer { if $ceilometer {
include 'ceilometer::client' include ceilometer::client
} }
if $cinder { if $cinder {
include 'cinder::client' include cinder::client
} }
if $glance { if $glance {
include 'glance::client' include glance::client
} }
if $keystone { if $keystone {
include 'keystone::client' include keystone::client
} }
if $nova { if $nova {
include 'nova::client' include nova::client
} }
if $quantum { if $quantum {
include 'quantum::client' include quantum::client
} }
} }

4
manifests/compute.pp
View File

@@ -44,7 +44,7 @@ class openstack::compute (
$enable_ovs_agent = true, $enable_ovs_agent = true,
$enable_l3_agent = false, $enable_l3_agent = false,
$enable_dhcp_agent = false, $enable_dhcp_agent = false,
$quantum_auth_url = "http://127.0.0.1:35357/v2.0", $quantum_auth_url = 'http://127.0.0.1:35357/v2.0',
$keystone_host = '127.0.0.1', $keystone_host = '127.0.0.1',
$quantum_host = '127.0.0.1', $quantum_host = '127.0.0.1',
$ovs_local_ip = false, $ovs_local_ip = false,
@@ -137,7 +137,7 @@ class openstack::compute (
if ! $quantum { if ! $quantum {
if ! $fixed_range { if ! $fixed_range {
fail("Must specify the fixed range when using nova-networks") fail('Must specify the fixed range when using nova-networks')
} }
if $multi_host { if $multi_host {

2
manifests/glance.pp
View File

@@ -47,7 +47,7 @@ class openstack::glance (
$backend = 'file', $backend = 'file',
$swift_store_user = false, $swift_store_user = false,
$swift_store_key = false, $swift_store_key = false,
$swift_store_auth_address = "http://127.0.0.1:5000/v2.0/", $swift_store_auth_address = 'http://127.0.0.1:5000/v2.0/',
$verbose = 'False', $verbose = 'False',
$debug = 'False', $debug = 'False',
$enabled = true $enabled = true

2
manifests/nova/controller.pp
View File

@@ -83,6 +83,8 @@ class openstack::nova::controller (
'mysql': { 'mysql': {
$nova_db = "mysql://${nova_db_user}:${nova_db_password}@${db_host}/${nova_db_dbname}" $nova_db = "mysql://${nova_db_user}:${nova_db_password}@${db_host}/${nova_db_dbname}"
} }
default: {
}
} }
if ($glance_api_servers == undef) { if ($glance_api_servers == undef) {

2
manifests/quantum.pp
View File

@@ -222,7 +222,7 @@ class openstack::quantum (
} }
} }
if $enable_l3_agent { if $enable_l3_agent {
class {"quantum::agents::l3": class { 'quantum::agents::l3':
use_namespaces => true, use_namespaces => true,
} }
} }

2
manifests/repo/epel.pp
View File

@@ -18,7 +18,7 @@ class openstack::repo::epel {
source => 'puppet:///modules/openstack/RPM-GPG-KEY-EPEL-6', source => 'puppet:///modules/openstack/RPM-GPG-KEY-EPEL-6',
owner => root, owner => root,
group => root, group => root,
mode => 644, mode => '0644',
before => Yumrepo['epel'], before => Yumrepo['epel'],
} }
Yumrepo['epel'] -> Package<||> Yumrepo['epel'] -> Package<||>

2
manifests/repo/rdo.pp
View File

@@ -23,7 +23,7 @@ class openstack::repo::rdo {
source => 'puppet:///modules/openstack/RPM-GPG-KEY-RDO-Grizzly', source => 'puppet:///modules/openstack/RPM-GPG-KEY-RDO-Grizzly',
owner => root, owner => root,
group => root, group => root,
mode => 644, mode => '0644',
before => Yumrepo['rdo-release'], before => Yumrepo['rdo-release'],
} }
Yumrepo['rdo-release'] -> Package<||> Yumrepo['rdo-release'] -> Package<||>

2
manifests/swift/storage-node.pp
View File

@@ -32,6 +32,8 @@ class openstack::swift::storage-node (
byte_size => $byte_size, byte_size => $byte_size,
} }
} }
default: {
}
} }
# install all swift storage servers together # install all swift storage servers together