opendev/system-config
Code Issues Proposed changes

Merge "Update grafana for new archive repo"

Browse Source
This commit is contained in:
Zuul 2019-04-17 03:38:50 +00:00 committed by Gerrit Code Review
commit 498151d7e2
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 # Node-OS: xenial
# Puppet-Version: !3
node /^grafana\d*\.open.*\.org$/ { node /^grafana\d*\.open.*\.org$/ {
$group = "grafana" $group = "grafana"
class { 'openstack_project::server': } 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-alternatives"]="0.3.0"
SOURCE_MODULES["https://github.com/voxpupuli/puppet-archive"]="v0.5.1" SOURCE_MODULES["https://github.com/voxpupuli/puppet-archive"]="v0.5.1"
SOURCE_MODULES["https://github.com/voxpupuli/puppet-git_resource"]="0.3.0" 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 SOURCE_MODULES["https://github.com/voxpupuli/puppet-grafana"]="v6.0.0"
# 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" SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="v2.3.0"