openstack
/
puppet-monasca
Code Issues Proposed changes

Merge "Fix puppet-lint before upgrading gem"

This commit is contained in:
Jenkins 2016-09-16 14:25:24 +00:00 committed by Gerrit Code Review
parent 098d07d7c3 0c7f731950
commit c54d48567f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/agent.pp
View File

@ -4,9 +4,6 @@
#
# === Parameters
#
# [*enabled*]
# flag to enable/disable the monasca agent
#
# [*url*]
# url of the monasca api server to POST metrics to
#
@ -19,6 +16,9 @@
# [*keystone_url*]
# keystone endpoint for authentication
#
# [*enabled*]
# flag to enable/disable the monasca agent
#
# [*project_name*]
# name of keystone project to POST metrics for
#
@ -120,11 +120,11 @@
# arguments to pass to the pip install command
#
class monasca::agent(
$enabled = true,
$url,
$username,
$password,
$keystone_url,
$enabled = true,
$project_name = 'null',
$project_domain_id = 'null',
$project_domain_name = 'null',

8
manifests/kafka/topics.pp
View File

@ -24,7 +24,9 @@ define monasca::kafka::topics (
) {
exec { "Ensure ${name} is created":
command =>"kafka-topics.sh --create --zookeeper ${kafka_zookeeper_connections} --replication-factor ${kafka_replication_factor} --partitions ${partitions} --topic ${name}",
# lint:ignore:140chars
command => "kafka-topics.sh --create --zookeeper ${kafka_zookeeper_connections} --replication-factor ${kafka_replication_factor} --partitions ${partitions} --topic ${name}",
# lint:endignore
path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${install_dir}/bin",
cwd => $install_dir,
user => 'root',
@ -32,11 +34,13 @@ define monasca::kafka::topics (
onlyif => "kafka-topics.sh --topic ${name} --list --zookeeper ${kafka_zookeeper_connections} | grep -q ${name}; test $? -ne 0"
} ->
exec { "Ensure ${name} is has ${partitions} partitions":
command =>"kafka-topics.sh --alter --zookeeper ${kafka_zookeeper_connections} --partitions ${partitions} --topic ${name}",
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,
user => 'root',
group => 'root',
# lint:ignore:140chars
onlyif => "kafka-topics.sh --describe --zookeeper ${kafka_zookeeper_connections} --topic ${name} | grep 'PartitionCount:${partitions}'; test $? -ne 0"
# lint:endignore
}
}