From 8ff03e30e6d850ec7bb9abd92fbb7b2677d3623c Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yolanda.robla-mota@hp.com>
Date: Thu, 6 Aug 2015 16:04:13 +0200
Subject: [PATCH] Add a reminder about grafana and puppet-archive conflict

There is a potential conflict in a grafana dependency,
camptocamp-archive, and the puppet-archive module that
is installed for system-config.
Adding a reminder on the module, to be sure we don't use
any archive functionality from grafana.

Change-Id: I95ad79d9498e30848863a5daca2480f1c1abd687
---
 modules.env | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules.env b/modules.env
index d028f365bd..9c40fbd814 100644
--- a/modules.env
+++ b/modules.env
@@ -35,6 +35,9 @@
 # - our intent was not to limit it's use and it should be Apache
 # licensed
 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"]="c51f03df3b41755bf3968c978d80b3fc94138652"
 SOURCE_MODULES["https://github.com/biemond/biemond-wildfly"]="v0.2.4"
 SOURCE_MODULES["https://github.com/maestrodev/puppet-wget"]="v1.6.0"