Fix this a better way. Drop using the vpn for some backups and merge all back into main inventory

2014-10-12 16:38:45 +00:00 · 2014-10-12 16:38:45 +00:00 · 6ac139fc90
commit 6ac139fc90
parent b6ac5167ed
25 changed files with 15 additions and 20 deletions
--- a/backups/inventory/host_vars/copr-be.cloud.fedoraproject.org
+++ b/backups/inventory/host_vars/copr-be.cloud.fedoraproject.org
@ -1,3 +0,0 @@
---
-# backup these directories
-host_backup_targets: ['/var/lib/copr/public_html/results']
--- a/backups/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org
+++ b/backups/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org
@ -1,2 +0,0 @@
---
-host_backup_targets: ['/backups']
--- a/backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org
+++ b/backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org
@ -1,2 +0,0 @@
---
-host_backup_targets: ['/backups']
--- a/backups/inventory/host_vars/db-qa01.qa.fedoraproject.org
+++ b/backups/inventory/host_vars/db-qa01.qa.fedoraproject.org
@ -1,2 +0,0 @@
---
-host_backup_targets: ['/backups']
--- a/backups/inventory/host_vars/hosted04.vpn.fedoraproject.org
+++ b/backups/inventory/host_vars/hosted04.vpn.fedoraproject.org
@ -1,2 +0,0 @@
---
-host_backup_targets: ['/srv']
--- a/backups/inventory/host_vars/log01.phx2.fedoraproject.org
+++ b/backups/inventory/host_vars/log01.phx2.fedoraproject.org
@ -1,2 +0,0 @@
---
-host_backup_targets: ['/var/log']
--- a/backups/inventory/host_vars/people03.vpn.fedoraproject.org
+++ b/backups/inventory/host_vars/people03.vpn.fedoraproject.org
@ -1,2 +0,0 @@
---
-host_backup_targets: ['/srv/web']
--- a/backups/inventory/host_vars/pkgs01.phx2.fedoraproject.org
+++ b/backups/inventory/host_vars/pkgs01.phx2.fedoraproject.org
@ -1,2 +0,0 @@
---
-host_backup_targets: ['/srv']
--- a/backups/inventory/host_vars/value01.phx2.fedoraproject.org
+++ b/backups/inventory/host_vars/value01.phx2.fedoraproject.org
@ -1,2 +0,0 @@
---
-host_backup_targets: ['/srv', '/var/lib/zodbot']
--- a/files/rdiff-backup/run-rdiff-backups
+++ b/files/rdiff-backup/run-rdiff-backups
@ -6,4 +6,4 @@ TMPDIR=`mktemp -d /tmp/backups.XXXX`

 cd $TMPDIR
 git clone https://infrastructure.fedoraproject.org/infra/ansible.git
-ansible-playbook -i ansible/backups/inventory ansible/playbooks/rdiff-backup.yml 
+ansible-playbook -i ansible/inventory ansible/playbooks/rdiff-backup.yml 
--- a/backups/inventory/inventory
+++ b/backups/inventory/inventory
--- a/backups/inventory/host_vars/collab04.vpn.fedoraproject.org
+++ b/backups/inventory/host_vars/collab04.vpn.fedoraproject.org
--- a/inventory/host_vars/copr-be.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-be.cloud.fedoraproject.org
@ -26,3 +26,5 @@ fedmsg_certs:
 # Copr vars

 copr_hostbase: copr-be
+
+host_backup_targets: ['/var/lib/copr/public_html/results']
--- a/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org
+++ b/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org
@ -26,3 +26,5 @@ fas_client_groups: sysadmin-dba,sysadmin-noc

 # kernel SHMMAX value
 kernel_shmmax: 68719476736
+
+host_backup_targets: ['/backups']
--- a/inventory/host_vars/db-koji01.phx2.fedoraproject.org
+++ b/inventory/host_vars/db-koji01.phx2.fedoraproject.org
@ -37,3 +37,5 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.125.59 --dport 5432 -j ACCEPT',
 # 
 nrpe_procs_warn: 400
 nrpe_procs_crit: 500
+
+host_backup_targets: ['/backups']
--- a/inventory/host_vars/db-qa01.qa.fedoraproject.org
+++ b/inventory/host_vars/db-qa01.qa.fedoraproject.org
@ -35,3 +35,5 @@ fas_client_groups: sysadmin-qa,sysadmin-noc

 # kernel SHMMAX value
 kernel_shmmax: 68719476736
+
+host_backup_targets: ['/backups']
--- a/backups/inventory/host_vars/db01.phx2.fedoraproject.org
+++ b/backups/inventory/host_vars/db01.phx2.fedoraproject.org
--- a/inventory/host_vars/hosted-lists01.fedoraproject.org
+++ b/inventory/host_vars/hosted-lists01.fedoraproject.org
@ -1,3 +1,4 @@
 ---
 freezes: false
 datacenter: internetx
+host_backup_targets: ['/srv']
--- a/backups/inventory/host_vars/hosted-lists01.vpn.fedoraproject.org
+++ b/backups/inventory/host_vars/hosted-lists01.vpn.fedoraproject.org
--- a/backups/inventory/host_vars/lockbox01.phx2.fedoraproject.org
+++ b/backups/inventory/host_vars/lockbox01.phx2.fedoraproject.org
--- a/inventory/host_vars/log01.phx2.fedoraproject.org
+++ b/inventory/host_vars/log01.phx2.fedoraproject.org
@ -20,3 +20,5 @@ mem_size: 16384
 num_cpus: 16

 fas_client_groups: fi-apprentice,sysadmin-logs,sysadmin-noc
+
+host_backup_targets: ['/var/log']
--- a/inventory/host_vars/people03.fedoraproject.org
+++ b/inventory/host_vars/people03.fedoraproject.org
@ -1,3 +1,4 @@
 ---
 freezes: false
 datacenter: ibiblio
+host_backup_targets: ['/srv/web']
--- a/inventory/host_vars/pkgs01.phx2.fedoraproject.org
+++ b/inventory/host_vars/pkgs01.phx2.fedoraproject.org
@ -1,3 +1,4 @@
 ---
 nm: 255.255.255.0
 eth1_ip: 10.5.127.67
+host_backup_targets: ['/srv']
--- a/backups/inventory/host_vars/qadevel.cloud.fedoraproject.org
+++ b/backups/inventory/host_vars/qadevel.cloud.fedoraproject.org
--- a/inventory/host_vars/value01.phx2.fedoraproject.org
+++ b/inventory/host_vars/value01.phx2.fedoraproject.org
@ -8,3 +8,4 @@ volgroup: /dev/vg_virthost03
 eth0_ip: 10.5.126.49
 vmhost: virthost03.phx2.fedoraproject.org
 datacenter: phx2
+host_backup_targets: ['/srv', '/var/lib/zodbot']