openstack
/
puppet-monasca
Code Issues Proposed changes

Fix lint issues to upgrade to puppet-lint 2.3 

2017-07-20 14:38:13.065997 | manifests/influxdb/bootstrap.pp:54:WARNING: arrow should be on the right operand's line
2017-07-20 14:38:13.066083 | manifests/kafka/topics.pp:35:WARNING: arrow should be on the right operand's line
2017-07-20 14:38:13.066114 | manifests/keystone/auth.pp:200:WARNING: arrow should be on the right operand's line
2017-07-20 14:38:13.066151 | manifests/keystone/auth.pp:202:WARNING: arrow should be on the right operand's line
2017-07-20 14:38:13.066176 | manifests/keystone/auth.pp:204:WARNING: arrow should be on the right operand's line
2017-07-20 14:38:13.066201 | manifests/keystone/auth.pp:275:WARNING: arrow should be on the right operand's line
2017-07-20 14:38:13.066226 | manifests/storm/config.pp:87:WARNING: arrow should be on the right operand's line
2017-07-20 14:38:13.066250 | manifests/storm/config.pp:95:WARNING: arrow should be on the right operand's line
2017-07-20 14:38:13.066275 | manifests/storm/config.pp:103:WARNING: arrow should be on the right operand's line

Change-Id: I87efeefd690bd6dd89dfd4b670fe7972a8003e4b
This commit is contained in:
Carlos Camacho 2017-07-20 20:16:34 +02:00
parent e966b524e2
commit 151e23ba85
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/influxdb/bootstrap.pp
View File

@ -51,8 +51,8 @@ class monasca::influxdb::bootstrap(
group => 'root',
}
Package['influxdb'] ->
exec { "/tmp/${script}":
require => [ Package['influxdb'], Service['influxdb'] ],
subscribe => File["/tmp/${script}"],
path => '/bin:/sbin:/usr/bin:/usr/sbin:/tmp',
cwd => '/tmp',
@ -63,6 +63,5 @@ class monasca::influxdb::bootstrap(
environment => ["INFLUX_ADMIN_PASSWORD=${influxdb_password}",
"DB_USER_PASSWORD=${influxdb_dbuser_password}",
"DB_READ_ONLY_USER_PASSWORD=${influxdb_dbuser_ro_password}"],
require => Service['influxdb'],
}
}

4
manifests/kafka/topics.pp
View File

@ -32,8 +32,8 @@ define monasca::kafka::topics (
user => 'root',
group => 'root',
onlyif => "kafka-topics.sh --topic ${name} --list --zookeeper ${kafka_zookeeper_connections} | grep -q ${name}; test $? -ne 0"
} ->
exec { "Ensure ${name} is has ${partitions} partitions":
}
-> exec { "Ensure ${name} is has ${partitions} partitions":
command => "kafka-topics.sh --alter --zookeeper ${kafka_zookeeper_connections} --partitions ${partitions} --topic ${name}",
path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${install_dir}/bin",
cwd => $install_dir,

16
manifests/keystone/auth.pp
View File

@ -197,12 +197,12 @@ class monasca::keystone::auth (
}
if $configure_user_role {
Keystone_user_role["${admin_name}@${tenant}"] ~>
Service <| name == 'monasca-api' |>
Keystone_user_role["${agent_name}@${tenant}"] ~>
Service <| name == 'monasca-api' |>
Keystone_user_role["${user_name}@${tenant}"] ~>
Service <| name == 'monasca-api' |>
Keystone_user_role["${admin_name}@${tenant}"]
~> Service <| name == 'monasca-api' |>
Keystone_user_role["${agent_name}@${tenant}"]
~> Service <| name == 'monasca-api' |>
Keystone_user_role["${user_name}@${tenant}"]
~> Service <| name == 'monasca-api' |>
if !defined(Keystone_role[$role_agent]) {
keystone_role { $role_agent:
@ -272,7 +272,7 @@ class monasca::keystone::auth (
}
if $configure_endpoint {
Keystone_endpoint["${region}/${service_name}::${service_type}"] ~>
Service <| name == 'monasca-api' |>
Keystone_endpoint["${region}/${service_name}::${service_type}"]
~> Service <| name == 'monasca-api' |>
}
}

6
manifests/storm/config.pp
View File

@ -84,25 +84,25 @@ class monasca::storm::config (
ensure => directory,
}
File[$install_dir] ->
monasca::storm::startup_script {
'/etc/init.d/storm-ui':
require => File[$install_dir],
storm_service => 'ui',
storm_install_dir => "${install_dir}/current",
storm_user => $storm_user,
}
File[$install_dir] -> File[$storm_local] ->
monasca::storm::startup_script {
'/etc/init.d/storm-supervisor':
require => [ File[$install_dir], File[$storm_local] ],
storm_service => 'supervisor',
storm_install_dir => "${install_dir}/current",
storm_user => $storm_user,
}
File[$install_dir] -> File[$storm_local] ->
monasca::storm::startup_script {
'/etc/init.d/storm-nimbus':
require => [ File[$install_dir], File[$storm_local] ],
storm_service => 'nimbus',
storm_install_dir => "${install_dir}/current",
storm_user => $storm_user,