From fb12d2620b1b1822b91f14270cc51360d424b2a3 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 15 Apr 2019 11:00:52 +1000 Subject: [PATCH] Update grafana for new archive repo Grafana has moved to a new package repo [1] and the apt-get update step is failing on the current host. The first version of puppet-grafana that has this update is 6.0.0; this is two years later than the current version we're using so ... yeah. It does not work with puppet3, so only run apply test with puppet4. It looks like upstream has moved from camptocamp/archive to voxpupuli/archive so the comment is no longer required. [1] https://grafana.com/blog/2019/01/05/moving-to-packages.grafana.com/ Change-Id: Ibab0ed6799563ba0f9674ef1ea575c6ac5d60341 --- manifests/site.pp | 1 + modules.env | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 80196785a1..f6f83fdf40 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -101,6 +101,7 @@ node /^review-dev\d*\.open.*\.org$/ { } # Node-OS: xenial +# Puppet-Version: !3 node /^grafana\d*\.open.*\.org$/ { $group = "grafana" class { 'openstack_project::server': } diff --git a/modules.env b/modules.env index a1ff9c0c37..d588876108 100644 --- a/modules.env +++ b/modules.env @@ -58,10 +58,7 @@ 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-grafana"]="v6.0.0" SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="v2.3.0"