From 44df1b5fd5b010520b1dfac076c9c30c2edd0e79 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 6 Jun 2018 14:16:53 +1000 Subject: [PATCH] Update puppet-grafana This module has been deprecated for the voxpupuli version. 2.6.1 is the last release with Puppet 3 support. It seems to mostly be a fork, so I think it is compatible. The repo is hard-coded which is why I think it's worth updating. Change-Id: I3ca7c04a4e6122625e716682f8e0d4f9b62dbfc0 --- modules.env | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules.env b/modules.env index c1a472ebb6..1de88cdd90 100644 --- a/modules.env +++ b/modules.env @@ -39,10 +39,6 @@ OPENSTACK_GIT_ROOT=https://git.openstack.org SOURCE_MODULES["https://git.drupal.org/project/puppet-drush"]="origin/1.0.x" SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-vcsrepo"]="0.0.8" -# 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"]="v2.1.0" SOURCE_MODULES["https://github.com/biemond/biemond-wildfly"]="v1.2.4" SOURCE_MODULES["https://github.com/dalen/puppet-dnsquery"]="2.0.1" SOURCE_MODULES["https://github.com/deric/puppet-zookeeper"]="v0.5.5" @@ -75,6 +71,10 @@ SOURCE_MODULES["https://github.com/vamsee/puppet-solr"]="0.0.8" SOURCE_MODULES["https://github.com/voxpupuli/puppet-alternatives"]="0.3.0" SOURCE_MODULES["https://github.com/voxpupuli/puppet-archive"]="v0.5.1" SOURCE_MODULES["https://github.com/voxpupuli/puppet-git_resource"]="0.3.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/voxpupuli/puppet-grafana"]="v2.6.1" SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="v2.3.0"