Browse Source

Merge "Update grafana for new archive repo"

Zuul 1 month ago
parent
commit
498151d7e2
2 changed files with 2 additions and 4 deletions
  1. 1
    0
      manifests/site.pp
  2. 1
    4
      modules.env

+ 1
- 0
manifests/site.pp View File

@@ -101,6 +101,7 @@ node /^review-dev\d*\.open.*\.org$/ {
101 101
 }
102 102
 
103 103
 # Node-OS: xenial
104
+# Puppet-Version: !3
104 105
 node /^grafana\d*\.open.*\.org$/ {
105 106
   $group = "grafana"
106 107
   class { 'openstack_project::server': }

+ 1
- 4
modules.env View File

@@ -58,10 +58,7 @@ SOURCE_MODULES["https://github.com/vamsee/puppet-solr"]="0.0.8"
58 58
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-alternatives"]="0.3.0"
59 59
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-archive"]="v0.5.1"
60 60
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-git_resource"]="0.3.0"
61
-# NOTE(yolanda): please note that grafana depends on camptocamp-archive. This is a
62
-# potential conflict with puppet-community/puppet-archive. So we cannot
63
-# rely on using any feature on grafana that relies on archive
64
-SOURCE_MODULES["https://github.com/voxpupuli/puppet-grafana"]="v2.6.1"
61
+SOURCE_MODULES["https://github.com/voxpupuli/puppet-grafana"]="v6.0.0"
65 62
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="v2.3.0"
66 63
 
67 64
 

Loading…
Cancel
Save