From 60b89d662e7a0d0a4ddbb4e158aa35f0ca1872dd Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 30 Oct 2017 13:03:42 +1100
Subject: [PATCH] Remove ci-backup-rs-ord.openstack.org

Migrate backups to new backup01.ord.rax.ci.openstack.org

We decided to start fresh backups on the new server, so this is ready
to go.  I have performed an initial backup on each server so it has
accepted the host key of the new server and been tested (I also fixed
up review-dev.o.o, which was rebuilt but keys not updated ... todo:
add this to puppet, but since it changes so infrequently not high
priority).

Change-Id: I0872f9fcf4a334d32f632b3cb04801deefab4fd1
---
 doc/source/sysadmin.rst                           | 15 +++++++++++----
 hiera/common.yaml                                 |  1 -
 manifests/site.pp                                 | 14 +-------------
 .../files/puppetmaster/groups.txt                 |  4 ++--
 modules/openstack_project/manifests/ask.pp        |  4 ++--
 modules/openstack_project/manifests/ethercalc.pp  |  4 ++--
 modules/openstack_project/manifests/etherpad.pp   |  4 ++--
 modules/openstack_project/manifests/groups.pp     |  4 ++--
 modules/openstack_project/manifests/lists.pp      |  4 ++--
 modules/openstack_project/manifests/review.pp     |  4 ++--
 modules/openstack_project/manifests/review_dev.pp |  4 ++--
 modules/openstack_project/manifests/storyboard.pp |  4 ++--
 modules/openstack_project/manifests/translate.pp  |  4 ++--
 modules/openstack_project/manifests/wiki.pp       |  4 ++--
 14 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/doc/source/sysadmin.rst b/doc/source/sysadmin.rst
index 032c425ef0..b076e60385 100644
--- a/doc/source/sysadmin.rst
+++ b/doc/source/sysadmin.rst
@@ -205,7 +205,7 @@ Backups
 
 Off-site backups are made to two servers:
 
- * ci-backup-rs-ord.openstack.org
+ * backup01.ord.rax.ci.openstack.org
  * TBD
 
 Puppet is used to perform the initial configuration of those machines,
@@ -226,20 +226,27 @@ And then ``cat /root/.ssh/id_rsa.pub`` for use later.
 
 On the backup servers::
 
+  # add bup user
   sudo su -
   BUPUSER=bup-<short-servername>  # eg, bup-jenkins-dev
   useradd -r $BUPUSER -s /bin/bash -d /opt/backups/$BUPUSER -m
-  cd /opt/backups/$BUPUSER
+  exit
+
+  sudo su - $BUPUSER
+  # should be in home directory /opt/backups/$BUPUSER
   mkdir .ssh
   cat >.ssh/authorized_keys
 
+  # initalise bup
+  bup init
+
 and add this to the authorized_keys file::
 
   command="BUP_DEBUG=0 BUP_FORCE_TTY=3 bup server",no-port-forwarding,no-agent-forwarding,no-X11-forwarding,no-pty <ssh key from earlier>
 
 Switching back to the server to be backed up, run::
 
-  ssh $BUPUSER@ci-backup-rs-ord.openstack.org
+  ssh $BUPUSER@backup01.ord.rax.ci.openstack.org
 
 And verify the host key.  Note this will start the bup server on the
 remote end, you will not be given a pty. Use ^D to close the connection
@@ -261,7 +268,7 @@ how we restore content from backups::
 
 At this point we can join the tar that was split by the backup cron::
 
-  bup join -r bup-<short-servername>@ci-backup-rs-ord.openstack.org: root > backup.tar
+  bup join -r bup-<short-servername>@backup01.ord.rax.ci.openstack.org: root > backup.tar
 
 At this point you may need to wait a while. These backups are stored on
 servers geographically distant from our normal servers resulting in less
diff --git a/hiera/common.yaml b/hiera/common.yaml
index 220faec1f8..a9145d2b84 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -236,7 +236,6 @@ cacti_hosts:
 - backup01.ord.rax.ci.openstack.org
 - baremetal00.vanilla.ic.openstack.org
 - cacti.openstack.org
-- ci-backup-rs-ord.openstack.org
 - controller00.vanilla.ic.openstack.org
 - compute000.vanilla.ic.openstack.org
 - compute001.vanilla.ic.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index a8dd756aa8..f43c7f5de9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1562,20 +1562,8 @@ node 'pbx.openstack.org' {
   }
 }
 
-# Node-OS: trusty
-# A backup machine.  Don't run cron or puppet agent on it.
-node /^ci-backup-.*\.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: xenial
-# A backup machine (new).  Don't run cron or puppet agent on it.
+# A backup machine.  Don't run cron or puppet agent on it.
 node /^backup\d+\..*\.ci\.openstack\.org$/ {
   $group = "ci-backup"
   class { 'openstack_project::server':
diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt
index 713e3cf944..7fb235f0b6 100644
--- a/modules/openstack_project/files/puppetmaster/groups.txt
+++ b/modules/openstack_project/files/puppetmaster/groups.txt
@@ -2,8 +2,8 @@ afs afs*.*.openstack.org
 afsadmin mirror-update.openstack.org:release.slave.openstack.org
 afsdb afsdb*.openstack.org
 cacti ~cacti\d+\.openstack\.org
-ci-backup ci-backup-*.openstack.org
-disabled ci-backup-rs-ord.openstack.org:db368fcd-e61a-4294-a5cb-851c16650f7a:wiki.openstack.org
+ci-backup backup\d+.*\ci\.openstack\.org
+disabled backup\d+.*\ci\.openstack\.org:wiki.openstack.org
 elasticsearch ~elasticsearch0[1-7]\.openstack\.org
 ethercalc ~ethercalc\d+\.openstack\.org
 files ~files\d+\.openstack\.org
diff --git a/modules/openstack_project/manifests/ask.pp b/modules/openstack_project/manifests/ask.pp
index e5d70ace34..92da8ad08b 100644
--- a/modules/openstack_project/manifests/ask.pp
+++ b/modules/openstack_project/manifests/ask.pp
@@ -153,9 +153,9 @@ class openstack_project::ask (
   }
 
   include bup
-  bup::site { 'rs-ord':
+  bup::site { 'ord.rax':
     backup_user   => 'bup-ask',
-    backup_server => 'ci-backup-rs-ord.openstack.org',
+    backup_server => 'backup01.ord.rax.ci.openstack.org',
   }
 
   class { '::httpd::logrotate':
diff --git a/modules/openstack_project/manifests/ethercalc.pp b/modules/openstack_project/manifests/ethercalc.pp
index 91bfd0ea4e..e54d56f559 100644
--- a/modules/openstack_project/manifests/ethercalc.pp
+++ b/modules/openstack_project/manifests/ethercalc.pp
@@ -27,8 +27,8 @@ class openstack_project::ethercalc (
   # pick this file up during its normal operation so no other DB dumping
   # is required like with mysql.
   include bup
-  bup::site { 'rs-ord':
+  bup::site { 'ord.rax':
     backup_user   => 'bup-ethercalc01',
-    backup_server => 'ci-backup-rs-ord.openstack.org',
+    backup_server => 'backup01.ord.rax.ci.openstack.org',
   }
 }
diff --git a/modules/openstack_project/manifests/etherpad.pp b/modules/openstack_project/manifests/etherpad.pp
index 92c6dcaed9..5812c6e235 100644
--- a/modules/openstack_project/manifests/etherpad.pp
+++ b/modules/openstack_project/manifests/etherpad.pp
@@ -46,9 +46,9 @@ class openstack_project::etherpad (
   }
 
   include bup
-  bup::site { 'rs-ord':
+  bup::site { 'ord.rax':
     backup_user   => 'bup-etherpad',
-    backup_server => 'ci-backup-rs-ord.openstack.org',
+    backup_server => 'backup01.ord.rax.ci.openstack.org',
   }
 }
 
diff --git a/modules/openstack_project/manifests/groups.pp b/modules/openstack_project/manifests/groups.pp
index 4595752109..5c49a46bad 100644
--- a/modules/openstack_project/manifests/groups.pp
+++ b/modules/openstack_project/manifests/groups.pp
@@ -78,9 +78,9 @@ class openstack_project::groups (
   }
 
   include bup
-  bup::site { 'rs-ord':
+  bup::site { 'ord.rax':
     backup_user   => 'bup-groups',
-    backup_server => 'ci-backup-rs-ord.openstack.org',
+    backup_server => 'backup01.ord.rax.ci.openstack.org',
   }
 
 }
diff --git a/modules/openstack_project/manifests/lists.pp b/modules/openstack_project/manifests/lists.pp
index 47fffac23a..1edb8723fa 100644
--- a/modules/openstack_project/manifests/lists.pp
+++ b/modules/openstack_project/manifests/lists.pp
@@ -28,9 +28,9 @@ class openstack_project::lists(
   user::virtual::disable { 'rockstar': }
 
   include bup
-  bup::site { 'rs-ord':
+  bup::site { 'ord.rax':
     backup_user   => 'bup-lists',
-    backup_server => 'ci-backup-rs-ord.openstack.org',
+    backup_server => 'backup01.ord.rax.ci.openstack.org',
   }
 
   Maillist {
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index efc7cf5f58..2cc8921efd 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -334,8 +334,8 @@ class openstack_project::review (
   }
 
   include bup
-  bup::site { 'rs-ord':
+  bup::site { 'ord.rax':
     backup_user   => 'bup-review',
-    backup_server => 'ci-backup-rs-ord.openstack.org',
+    backup_server => 'backup01.ord.rax.ci.openstack.org',
   }
 }
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index 8d5c08923a..125231fe06 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -228,8 +228,8 @@ class openstack_project::review_dev (
   }
 
   include bup
-  bup::site { 'rs-ord':
+  bup::site { 'ord.rax':
     backup_user   => 'bup-review-dev',
-    backup_server => 'ci-backup-rs-ord.openstack.org',
+    backup_server => 'backup01.ord.rax.ci.openstack.org',
   }
 }
diff --git a/modules/openstack_project/manifests/storyboard.pp b/modules/openstack_project/manifests/storyboard.pp
index 01feb3626a..f2b19800e8 100644
--- a/modules/openstack_project/manifests/storyboard.pp
+++ b/modules/openstack_project/manifests/storyboard.pp
@@ -123,8 +123,8 @@ class openstack_project::storyboard(
   }
 
   include bup
-  bup::site { 'rs-ord':
+  bup::site { 'ord.rax':
     backup_user   => 'bup-storyboard',
-    backup_server => 'ci-backup-rs-ord.openstack.org',
+    backup_server => 'backup01.ord.rax.ci.openstack.org',
   }
 }
diff --git a/modules/openstack_project/manifests/translate.pp b/modules/openstack_project/manifests/translate.pp
index ee1959dc82..0550425217 100644
--- a/modules/openstack_project/manifests/translate.pp
+++ b/modules/openstack_project/manifests/translate.pp
@@ -137,8 +137,8 @@ class openstack_project::translate(
   }
 
   include bup
-  bup::site { 'rs-ord':
+  bup::site { 'ord.rax':
     backup_user   => 'bup-translate',
-    backup_server => 'ci-backup-rs-ord.openstack.org',
+    backup_server => 'backup01.ord.rax.ci.openstack.org',
   }
 }
diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp
index 979721ae72..cd03538284 100644
--- a/modules/openstack_project/manifests/wiki.pp
+++ b/modules/openstack_project/manifests/wiki.pp
@@ -77,9 +77,9 @@ class openstack_project::wiki (
 
   if $bup_user != undef {
     include bup
-    bup::site { 'rs-ord':
+    bup::site { 'ord.rax':
       backup_user   => $bup_user,
-      backup_server => 'ci-backup-rs-ord.openstack.org',
+      backup_server => 'backup01.ord.rax.ci.openstack.org',
     }
   }