From 6ac139fc905cb163e4e51e63a589cca1d7709088 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 12 Oct 2014 16:38:45 +0000 Subject: [PATCH] Fix this a better way. Drop using the vpn for some backups and merge all back into main inventory --- backups/inventory/host_vars/copr-be.cloud.fedoraproject.org | 3 --- .../inventory/host_vars/db-datanommer02.phx2.fedoraproject.org | 2 -- backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org | 2 -- backups/inventory/host_vars/db-qa01.qa.fedoraproject.org | 2 -- backups/inventory/host_vars/hosted04.vpn.fedoraproject.org | 2 -- backups/inventory/host_vars/log01.phx2.fedoraproject.org | 2 -- backups/inventory/host_vars/people03.vpn.fedoraproject.org | 2 -- backups/inventory/host_vars/pkgs01.phx2.fedoraproject.org | 2 -- backups/inventory/host_vars/value01.phx2.fedoraproject.org | 2 -- files/rdiff-backup/run-rdiff-backups | 2 +- backups/inventory/inventory => inventory/backups | 0 .../host_vars/collab04.fedoraproject.org | 0 inventory/host_vars/copr-be.cloud.fedoraproject.org | 2 ++ inventory/host_vars/db-datanommer02.phx2.fedoraproject.org | 2 ++ inventory/host_vars/db-koji01.phx2.fedoraproject.org | 2 ++ inventory/host_vars/db-qa01.qa.fedoraproject.org | 2 ++ .../host_vars/db01.phx2.fedoraproject.org | 0 inventory/host_vars/hosted-lists01.fedoraproject.org | 1 + .../host_vars/hosted04.fedoraproject.org | 0 .../host_vars/lockbox01.phx2.fedoraproject.org | 0 inventory/host_vars/log01.phx2.fedoraproject.org | 2 ++ inventory/host_vars/people03.fedoraproject.org | 1 + inventory/host_vars/pkgs01.phx2.fedoraproject.org | 1 + .../host_vars/qadevel.cloud.fedoraproject.org | 0 inventory/host_vars/value01.phx2.fedoraproject.org | 1 + 25 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 backups/inventory/host_vars/copr-be.cloud.fedoraproject.org delete mode 100644 backups/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org delete mode 100644 backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org delete mode 100644 backups/inventory/host_vars/db-qa01.qa.fedoraproject.org delete mode 100644 backups/inventory/host_vars/hosted04.vpn.fedoraproject.org delete mode 100644 backups/inventory/host_vars/log01.phx2.fedoraproject.org delete mode 100644 backups/inventory/host_vars/people03.vpn.fedoraproject.org delete mode 100644 backups/inventory/host_vars/pkgs01.phx2.fedoraproject.org delete mode 100644 backups/inventory/host_vars/value01.phx2.fedoraproject.org rename backups/inventory/inventory => inventory/backups (100%) rename backups/inventory/host_vars/collab04.vpn.fedoraproject.org => inventory/host_vars/collab04.fedoraproject.org (100%) rename {backups/inventory => inventory}/host_vars/db01.phx2.fedoraproject.org (100%) rename backups/inventory/host_vars/hosted-lists01.vpn.fedoraproject.org => inventory/host_vars/hosted04.fedoraproject.org (100%) rename {backups/inventory => inventory}/host_vars/lockbox01.phx2.fedoraproject.org (100%) rename {backups/inventory => inventory}/host_vars/qadevel.cloud.fedoraproject.org (100%) diff --git a/backups/inventory/host_vars/copr-be.cloud.fedoraproject.org b/backups/inventory/host_vars/copr-be.cloud.fedoraproject.org deleted file mode 100644 index 7f29102021..0000000000 --- a/backups/inventory/host_vars/copr-be.cloud.fedoraproject.org +++ /dev/null @@ -1,3 +0,0 @@ ---- -# backup these directories -host_backup_targets: ['/var/lib/copr/public_html/results'] diff --git a/backups/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org b/backups/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org deleted file mode 100644 index 149ad66fbd..0000000000 --- a/backups/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -host_backup_targets: ['/backups'] diff --git a/backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org b/backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org deleted file mode 100644 index 149ad66fbd..0000000000 --- a/backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -host_backup_targets: ['/backups'] diff --git a/backups/inventory/host_vars/db-qa01.qa.fedoraproject.org b/backups/inventory/host_vars/db-qa01.qa.fedoraproject.org deleted file mode 100644 index 149ad66fbd..0000000000 --- a/backups/inventory/host_vars/db-qa01.qa.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -host_backup_targets: ['/backups'] diff --git a/backups/inventory/host_vars/hosted04.vpn.fedoraproject.org b/backups/inventory/host_vars/hosted04.vpn.fedoraproject.org deleted file mode 100644 index fbc0826155..0000000000 --- a/backups/inventory/host_vars/hosted04.vpn.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -host_backup_targets: ['/srv'] diff --git a/backups/inventory/host_vars/log01.phx2.fedoraproject.org b/backups/inventory/host_vars/log01.phx2.fedoraproject.org deleted file mode 100644 index d2ecc7e6f2..0000000000 --- a/backups/inventory/host_vars/log01.phx2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -host_backup_targets: ['/var/log'] diff --git a/backups/inventory/host_vars/people03.vpn.fedoraproject.org b/backups/inventory/host_vars/people03.vpn.fedoraproject.org deleted file mode 100644 index b9b4978c6a..0000000000 --- a/backups/inventory/host_vars/people03.vpn.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -host_backup_targets: ['/srv/web'] diff --git a/backups/inventory/host_vars/pkgs01.phx2.fedoraproject.org b/backups/inventory/host_vars/pkgs01.phx2.fedoraproject.org deleted file mode 100644 index fbc0826155..0000000000 --- a/backups/inventory/host_vars/pkgs01.phx2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -host_backup_targets: ['/srv'] diff --git a/backups/inventory/host_vars/value01.phx2.fedoraproject.org b/backups/inventory/host_vars/value01.phx2.fedoraproject.org deleted file mode 100644 index 9023720911..0000000000 --- a/backups/inventory/host_vars/value01.phx2.fedoraproject.org +++ /dev/null @@ -1,2 +0,0 @@ ---- -host_backup_targets: ['/srv', '/var/lib/zodbot'] diff --git a/files/rdiff-backup/run-rdiff-backups b/files/rdiff-backup/run-rdiff-backups index c70ee9acb3..ec6ebf3586 100644 --- 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 diff --git a/backups/inventory/inventory b/inventory/backups similarity index 100% rename from backups/inventory/inventory rename to inventory/backups diff --git a/backups/inventory/host_vars/collab04.vpn.fedoraproject.org b/inventory/host_vars/collab04.fedoraproject.org similarity index 100% rename from backups/inventory/host_vars/collab04.vpn.fedoraproject.org rename to inventory/host_vars/collab04.fedoraproject.org diff --git a/inventory/host_vars/copr-be.cloud.fedoraproject.org b/inventory/host_vars/copr-be.cloud.fedoraproject.org index 375988eb0a..fb706f25c2 100644 --- 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'] diff --git a/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org b/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org index a240e64fb5..84b1ad7b40 100644 --- 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'] diff --git a/inventory/host_vars/db-koji01.phx2.fedoraproject.org b/inventory/host_vars/db-koji01.phx2.fedoraproject.org index 176c7bbd56..c045a1d5d1 100644 --- 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'] diff --git a/inventory/host_vars/db-qa01.qa.fedoraproject.org b/inventory/host_vars/db-qa01.qa.fedoraproject.org index 71a3957ec5..03cee8ac1f 100644 --- 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'] diff --git a/backups/inventory/host_vars/db01.phx2.fedoraproject.org b/inventory/host_vars/db01.phx2.fedoraproject.org similarity index 100% rename from backups/inventory/host_vars/db01.phx2.fedoraproject.org rename to inventory/host_vars/db01.phx2.fedoraproject.org diff --git a/inventory/host_vars/hosted-lists01.fedoraproject.org b/inventory/host_vars/hosted-lists01.fedoraproject.org index 0c147cba11..5d8ad18224 100644 --- 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'] diff --git a/backups/inventory/host_vars/hosted-lists01.vpn.fedoraproject.org b/inventory/host_vars/hosted04.fedoraproject.org similarity index 100% rename from backups/inventory/host_vars/hosted-lists01.vpn.fedoraproject.org rename to inventory/host_vars/hosted04.fedoraproject.org diff --git a/backups/inventory/host_vars/lockbox01.phx2.fedoraproject.org b/inventory/host_vars/lockbox01.phx2.fedoraproject.org similarity index 100% rename from backups/inventory/host_vars/lockbox01.phx2.fedoraproject.org rename to inventory/host_vars/lockbox01.phx2.fedoraproject.org diff --git a/inventory/host_vars/log01.phx2.fedoraproject.org b/inventory/host_vars/log01.phx2.fedoraproject.org index 0da7cb0e6d..9628c5567b 100644 --- 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'] diff --git a/inventory/host_vars/people03.fedoraproject.org b/inventory/host_vars/people03.fedoraproject.org index b4c8e03414..2aed120946 100644 --- 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'] diff --git a/inventory/host_vars/pkgs01.phx2.fedoraproject.org b/inventory/host_vars/pkgs01.phx2.fedoraproject.org index 6ea7ea14e1..0bf61a6833 100644 --- 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'] diff --git a/backups/inventory/host_vars/qadevel.cloud.fedoraproject.org b/inventory/host_vars/qadevel.cloud.fedoraproject.org similarity index 100% rename from backups/inventory/host_vars/qadevel.cloud.fedoraproject.org rename to inventory/host_vars/qadevel.cloud.fedoraproject.org diff --git a/inventory/host_vars/value01.phx2.fedoraproject.org b/inventory/host_vars/value01.phx2.fedoraproject.org index e099110b9c..e909e2cccf 100644 --- 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']