From 31eeb76f04b787280d8623608ec144b31af5d8ab Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 21 Mar 2019 13:35:20 -0700
Subject: [PATCH] Remove code to handle grafana 2.x installations

On our old trusty hosts we were installing grafana 2.x and new xenial we
install 5.x. Remove the code to install the old version on trusty.

Change-Id: I8d4e15d890f78dff9da9c47bb1b61987002c6cd9
---
 modules/openstack_project/manifests/grafana.pp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/openstack_project/manifests/grafana.pp b/modules/openstack_project/manifests/grafana.pp
index 206c5d4bc1..7eae94899c 100644
--- a/modules/openstack_project/manifests/grafana.pp
+++ b/modules/openstack_project/manifests/grafana.pp
@@ -53,11 +53,7 @@ class openstack_project::grafana (
 
   $grafana_cfg_merged = merge($grafana_cfg_defaults, $grafana_cfg)
 
-  if ( $::hostname == "grafana02" ) {
-    $version = '5.1.3'
-  } else {
-    $version = '2.6.0'
-  }
+  $version = '5.1.3'
 
   class { '::grafana':
     cfg            => $grafana_cfg_merged,