From 0d8730fa5dacee2af5736a959ae3459b14268274 Mon Sep 17 00:00:00 2001
From: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com>
Date: Wed, 28 Sep 2016 22:50:54 +0200
Subject: [PATCH] Add cacti01 replacement node to Puppet

We need to replace cacti as it is struggling with memory issues.
Created cacti01 machine with 4GB, now adding the node declaration
to Puppet so it gets configured as a Cacti server.

Change-Id: I47a286079e44cd22686e99b8e4c229c693d509d1
---
 manifests/site.pp                                     | 11 +++++++++++
 .../openstack_project/files/puppetmaster/groups.txt   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/manifests/site.pp b/manifests/site.pp
index 3797cbab47..33a8815626 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -174,6 +174,17 @@ node 'cacti.openstack.org' {
   }
 }
 
+# Node-OS: trusty
+node /^cacti\d+\.openstack\.org$/ {
+  $group = "cacti"
+  include openstack_project::ssl_cert_check
+  class { 'openstack_project::cacti':
+    sysadmins   => hiera('sysadmins', []),
+    cacti_hosts => hiera_array('cacti_hosts'),
+    vhost_name  => 'cacti.openstack.org',
+  }
+}
+
 # Node-OS: trusty
 node 'puppetmaster.openstack.org' {
   class { 'openstack_project::server':
diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt
index a302aa3a26..5df3b96423 100644
--- a/modules/openstack_project/files/puppetmaster/groups.txt
+++ b/modules/openstack_project/files/puppetmaster/groups.txt
@@ -4,6 +4,7 @@ elasticsearch ~elasticsearch0[1-7]\.openstack\.org
 git-loadbalancer ~git(-fe\d+)?\.openstack\.org
 git-server ~git\d+\.openstack\.org
 zuul-merger ~z[lm](static)?\d+\.openstack\.org
+cacti ~cacti\d+\.openstack\.org
 ci-backup ci-backup-*.openstack.org
 afsdb afsdb*.openstack.org
 afs afs*.*.openstack.org