From b137b89fa5a4e488d4474e0fee8f6dbf55fd5e40 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 30 Oct 2017 10:55:09 +1100
Subject: [PATCH] Add new backup host to puppet

Add definition for a new backup host.  We'll use ci.openstack.org to
make it clear it's not general-purpose, and more mirror-like name in
the form

 backup01.region.provider.ci.opentack.org

We have decided to start with fresh backups, so this is using a fresh
3TiB LVM of cinder volumes.  After removing the old server, we will
attach the old volumes to this for a period in case we need it.

Change-Id: I7d0c96ef6f1c68d977da70c047065b10f975b4f2
---
 hiera/common.yaml |  1 +
 manifests/site.pp | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/hiera/common.yaml b/hiera/common.yaml
index 6018e0e517..220faec1f8 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -233,6 +233,7 @@ cacti_hosts:
 - afsdb02.openstack.org
 - apps.openstack.org
 - ask.openstack.org
+- backup01.ord.rax.ci.openstack.org
 - baremetal00.vanilla.ic.openstack.org
 - cacti.openstack.org
 - ci-backup-rs-ord.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 7b75cee135..d4e324603b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1567,6 +1567,18 @@ node /^ci-backup-.*\.openstack\.org$/ {
   include openstack_project::backup_server
 }
 
+# Node-OS: xenial
+# A backup machine (new).  Don't run cron or puppet agent on it.
+node /^backup\d+\..*\.ci\.openstack\.org$/ {
+  $group = "ci-backup"
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [],
+    manage_exim => false,
+    purge_apt_sources => false,
+  }
+  include openstack_project::backup_server
+}
+
 # Node-OS: trusty
 node 'proposal.slave.openstack.org' {
   include openstack_project