opendev/system-config
Code Issues Proposed changes

Update grafana for new archive repo

Browse Source 
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
This commit is contained in:
Ian Wienand 2019-04-15 11:00:52 +10:00
parent 6a1d4da730
commit fb12d2620b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -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': }

5
modules.env
View File

@ -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"