From 44e4f194c092b4fc5ae05682a373ff9d619ee445 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 6 Jun 2018 14:27:05 +1000 Subject: [PATCH] Install later grafana on graphite02 This is a new server bringing up the new graphite version Change-Id: I38cad90bb68c490b345e6ec2c25c4864076d373d --- modules/openstack_project/manifests/grafana.pp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/manifests/grafana.pp b/modules/openstack_project/manifests/grafana.pp index 2f24503209..a1b84259e8 100644 --- a/modules/openstack_project/manifests/grafana.pp +++ b/modules/openstack_project/manifests/grafana.pp @@ -53,6 +53,12 @@ class openstack_project::grafana ( $grafana_cfg_merged = merge($grafana_cfg_defaults, $grafana_cfg) + if ( $::hostname == "graphite02" ) { + $version = '5.1.3' + } else { + $version = '2.6.0' + } + class { '::grafana': cfg => $grafana_cfg_merged, # Note that we can't use archive because that install_method requires @@ -60,7 +66,7 @@ class openstack_project::grafana ( # in modules.env, and puppet only supports having one in the modulepath # at a time. install_method => 'repo', - version => '2.6.0', + version => $version, } ::httpd::vhost { $vhost_name: