aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorGael Chamoulaud <gchamoul@redhat.com>2015-03-17 10:21:58 +0100
committerGael Chamoulaud <gchamoul@redhat.com>2015-03-17 10:23:32 +0100
commit653d7dcb13efd8c18e65051114700b81f160d812 (patch)
tree96a59e44260de4185479cc594f491a8dea17dbef /manifests
parent68e85e520d73527bc04bd70807b749091391d8e4 (diff)
Add Puppet 4.x lint checks
- This changes the puppet-lint requirement to 1.1.x, so that we can use puppet-lint plugins. Most of these plugins are for 4.x compat, but some just catch common errors. Change-Id: I2660b960b6ef696bd5dc8a6965b4a9aa25409b66 Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
Diffstat (limited to 'manifests')
-rw-r--r--manifests/database/mysql.pp34
-rw-r--r--manifests/loadbalancer.pp38
2 files changed, 36 insertions, 36 deletions
diff --git a/manifests/database/mysql.pp b/manifests/database/mysql.pp
index dae80b3..1d621a5 100644
--- a/manifests/database/mysql.pp
+++ b/manifests/database/mysql.pp
@@ -132,12 +132,12 @@ class tripleo::database::mysql (
ensure => 'present',
charset => 'utf8',
collate => 'utf8_unicode_ci',
- require => File['/root/.my.cnf']
+ require => File['/root/.my.cnf'],
}
mysql_user { "${galera_clustercheck_dbuser}@localhost":
ensure => 'present',
password_hash => mysql_password($galera_clustercheck_dbpassword),
- require => File['/root/.my.cnf']
+ require => File['/root/.my.cnf'],
}
mysql_grant { "${galera_clustercheck_dbuser}@localhost/monitoring":
ensure => 'present',
@@ -181,7 +181,7 @@ class tripleo::database::mysql (
command => '/usr/bin/mysql_install_db --rpm --user=mysql',
unless => 'test -d /var/lib/mysql/mysql',
before => Service['mysqld'],
- require => [Package[$mysql_server_package_name], File[$mysql_server_config_file]]
+ require => [Package[$mysql_server_package_name], File[$mysql_server_config_file]],
}
}
@@ -201,7 +201,7 @@ class tripleo::database::mysql (
mysql_user { 'debian-sys-maint@localhost':
ensure => 'present',
password_hash => mysql_password($mysql_sys_maint_password),
- require => File['/root/.my.cnf']
+ require => File['/root/.my.cnf'],
}
file{'/etc/mysql/debian.cnf':
@@ -227,7 +227,7 @@ class tripleo::database::mysql (
before => Package[$mysql_server_package_name],
}
- class { 'mysql::server':
+ class { '::mysql::server':
manage_config_file => false,
config_file => $mysql_server_config_file,
package_name => $mysql_server_package_name,
@@ -235,7 +235,7 @@ class tripleo::database::mysql (
override_options => {
'mysqld' => {
'bind-address' => $bind_address,
- }
+ },
},
root_password => $mysql_root_password,
notify => Service['xinetd'],
@@ -250,7 +250,7 @@ class tripleo::database::mysql (
require => Package[$mysql_server_package_name],
}
- class { 'mysql::client':
+ class { '::mysql::client':
package_name => $mysql_client_package_name,
}
@@ -264,7 +264,7 @@ class tripleo::database::mysql (
'set service-name[. = "mysqlchk"]/protocol tcp',
],
onlyif => 'match service-name[. = "mysqlchk"] size == 0',
- notify => [ Service['xinetd'], Exec['reload_xinetd'] ]
+ notify => [ Service['xinetd'], Exec['reload_xinetd'] ],
}
file {
'/etc/xinetd.d/mysqlchk':
@@ -292,11 +292,11 @@ class tripleo::database::mysql (
}
} else {
# When HA is disabled
- class { 'mysql::server':
+ class { '::mysql::server':
override_options => {
'mysqld' => {
'bind-address' => $bind_address,
- }
+ },
},
root_password => $mysql_root_password,
}
@@ -307,7 +307,7 @@ class tripleo::database::mysql (
# Create all the database schemas
$allowed_hosts = ['%',$controller_host]
$keystone_dsn = split($keystone_database_connection, '[@:/?]')
- class { 'keystone::db::mysql':
+ class { '::keystone::db::mysql':
user => $keystone_dsn[3],
password => $keystone_dsn[4],
host => $keystone_dsn[5],
@@ -315,7 +315,7 @@ class tripleo::database::mysql (
allowed_hosts => $allowed_hosts,
}
$glance_dsn = split($glance_database_connection, '[@:/?]')
- class { 'glance::db::mysql':
+ class { '::glance::db::mysql':
user => $glance_dsn[3],
password => $glance_dsn[4],
host => $glance_dsn[5],
@@ -323,7 +323,7 @@ class tripleo::database::mysql (
allowed_hosts => $allowed_hosts,
}
$nova_dsn = split($nova_database_connection, '[@:/?]')
- class { 'nova::db::mysql':
+ class { '::nova::db::mysql':
user => $nova_dsn[3],
password => $nova_dsn[4],
host => $nova_dsn[5],
@@ -331,7 +331,7 @@ class tripleo::database::mysql (
allowed_hosts => $allowed_hosts,
}
$neutron_dsn = split($neutron_database_connection, '[@:/?]')
- class { 'neutron::db::mysql':
+ class { '::neutron::db::mysql':
user => $neutron_dsn[3],
password => $neutron_dsn[4],
host => $neutron_dsn[5],
@@ -339,7 +339,7 @@ class tripleo::database::mysql (
allowed_hosts => $allowed_hosts,
}
$cinder_dsn = split($cinder_database_connection, '[@:/?]')
- class { 'cinder::db::mysql':
+ class { '::cinder::db::mysql':
user => $cinder_dsn[3],
password => $cinder_dsn[4],
host => $cinder_dsn[5],
@@ -347,7 +347,7 @@ class tripleo::database::mysql (
allowed_hosts => $allowed_hosts,
}
$heat_dsn = split($heat_database_connection, '[@:/?]')
- class { 'heat::db::mysql':
+ class { '::heat::db::mysql':
user => $heat_dsn[3],
password => $heat_dsn[4],
host => $heat_dsn[5],
@@ -355,7 +355,7 @@ class tripleo::database::mysql (
allowed_hosts => $allowed_hosts,
}
$ceilometer_dsn = split($ceilometer_database_connection, '[@:/?]')
- class { 'ceilometer::db::mysql':
+ class { '::ceilometer::db::mysql':
user => $ceilometer_dsn[3],
password => $ceilometer_dsn[4],
host => $ceilometer_dsn[5],
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index c9e3b41..b9861ff 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -158,7 +158,7 @@ class tripleo::loadbalancer (
}
}
- class { 'keepalived': }
+ class { '::keepalived': }
keepalived::vrrp_script { 'haproxy':
name_is_process => $keepalived_name_is_process,
script => $keepalived_vrrp_script,
@@ -184,7 +184,7 @@ class tripleo::loadbalancer (
sysctl::value { 'net.ipv4.ip_nonlocal_bind': value => '1' }
- class { 'haproxy':
+ class { '::haproxy':
global_options => {
'log' => '/dev/log local0',
'pidfile' => '/var/run/haproxy.pid',
@@ -218,7 +218,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 35357,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -235,7 +235,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 5000,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -252,7 +252,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 9696,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -269,7 +269,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 8776,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -286,7 +286,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 9292,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -303,7 +303,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 9191,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -320,7 +320,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 8773,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -337,7 +337,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 8774,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -354,7 +354,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 8775,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -371,7 +371,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 6080,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -402,7 +402,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 8080,
options => {
- 'option' => [ 'httpchk GET /info' ]
+ 'option' => [ 'httpchk GET /info' ],
},
collect_exported => false,
}
@@ -419,7 +419,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 8004,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -436,7 +436,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 8003,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -453,7 +453,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 8000,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -470,7 +470,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 80,
options => {
- 'option' => [ 'httpchk GET /' ]
+ 'option' => [ 'httpchk GET /' ],
},
collect_exported => false,
}
@@ -487,7 +487,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip],
ports => 3306,
options => {
- 'timeout' => [ 'client 0', 'server 0' ]
+ 'timeout' => [ 'client 0', 'server 0' ],
},
collect_exported => false,
}
@@ -504,7 +504,7 @@ class tripleo::loadbalancer (
ipaddress => [$controller_virtual_ip, $public_virtual_ip],
ports => 5672,
options => {
- 'timeout' => [ 'client 0', 'server 0' ]
+ 'timeout' => [ 'client 0', 'server 0' ],
},
collect_exported => false,
}