opendev/system-config
Code Issues Proposed changes

Merge "Upgrade grafana.o.o to 2.1.0"

Browse Source
This commit is contained in:
Jenkins 2015-08-21 21:01:30 +00:00 committed by Gerrit Code Review
commit 71fa52b28f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules.env
View File

@ -38,7 +38,7 @@ SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-vcsrepo"]="0.0.
# NOTE(yolanda): please note that grafana depends on camptocamp-archive. This is a
# potential conflict with puppet-community/puppet-archive. So we cannot
# rely on using any feature on grafana that relies on archive
SOURCE_MODULES["https://github.com/bfraser/puppet-grafana"]="c51f03df3b41755bf3968c978d80b3fc94138652"
SOURCE_MODULES["https://github.com/bfraser/puppet-grafana"]="v2.1.0"
SOURCE_MODULES["https://github.com/biemond/biemond-wildfly"]="v0.2.4"
SOURCE_MODULES["https://github.com/maestrodev/puppet-wget"]="v1.6.0"
SOURCE_MODULES["https://github.com/nanliu/puppet-git"]="0.1.0"

4
modules/openstack_project/manifests/grafana.pp
View File

@ -51,7 +51,9 @@ class openstack_project::grafana (
$grafana_cfg_merged = merge($grafana_cfg_defaults, $grafana_cfg)
class { '::grafana':
cfg => $grafana_cfg_merged,
cfg => $grafana_cfg_merged,
install_method => 'repo',
version => '2.1.0',
}
::httpd::vhost { $vhost_name: