Merge "Remove ci-backup-rs-ord.openstack.org"

This commit is contained in:
Zuul 2017-11-16 03:54:47 +00:00 committed by Gerrit Code Review
commit d7325d319f
14 changed files with 34 additions and 40 deletions

View File

@ -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

View File

@ -242,7 +242,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

View File

@ -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':

View File

@ -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

View File

@ -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':

View File

@ -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',
}
}

View File

@ -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',
}
}

View File

@ -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',
}
}

View File

@ -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 {

View File

@ -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',
}
}

View File

@ -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',
}
}

View File

@ -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',
}
}

View File

@ -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',
}
}

View File

@ -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',
}
}