From e7a7e78f00b8b0cdcc38d6c69aaab74062cb7add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 18 May 2015 15:31:44 +0200 Subject: [PATCH] migrate copr-be to new cloud --- inventory/group_vars/copr | 2 +- inventory/group_vars/copr-keygen | 4 +-- .../host_vars/copr-be.cloud.fedoraproject.org | 29 +++++++++---------- roles/copr/base/files/yum/copr.repo | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/inventory/group_vars/copr b/inventory/group_vars/copr index d679f280f9..5e0b6c0d5b 100644 --- a/inventory/group_vars/copr +++ b/inventory/group_vars/copr @@ -3,7 +3,7 @@ devel: false _forward_src: "forward" # don't forget to update ip in ./copr-keygen, due to custom firewall rules -copr_backend_ips: "172.16.5.5 209.132.184.142" +copr_backend_ips: "172.16.5.5 209.132.184.48" keygen_host: "172.16.5.25" resolvconf: "resolv.conf/cloud" diff --git a/inventory/group_vars/copr-keygen b/inventory/group_vars/copr-keygen index 1bf9586765..8d8baace2d 100644 --- a/inventory/group_vars/copr-keygen +++ b/inventory/group_vars/copr-keygen @@ -3,9 +3,9 @@ tcp_ports: [22] # http + signd dest ports custom_rules: [ '-A INPUT -p tcp -m tcp -s 172.16.5.5 --dport 80 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 209.132.184.142 --dport 80 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 209.132.184.48 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 172.16.5.5 --dport 5167 -j ACCEPT', - '-A INPUT -p tcp -m tcp -s 209.132.184.142 --dport 5167 -j ACCEPT'] + '-A INPUT -p tcp -m tcp -s 209.132.184.48 --dport 5167 -j ACCEPT'] datacenter: cloud diff --git a/inventory/host_vars/copr-be.cloud.fedoraproject.org b/inventory/host_vars/copr-be.cloud.fedoraproject.org index 5767365f82..edd73bc76d 100644 --- a/inventory/host_vars/copr-be.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be.cloud.fedoraproject.org @@ -1,14 +1,22 @@ --- -instance_type: m1.xlarge -image: "{{ f20_qcow_id }}" + +instance_type: ms1.xlarge +image: "{{ fedora21_x86_64 }}" keypair: fedora-admin-20130801 -security_group: webserver +security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default zone: nova hostbase: copr-be- -public_ip: 209.132.184.142 -root_auth_users: bkabrda msuchy pingou msuchy sgallagh nb asamalik vgologuz +public_ip: 209.132.184.48 +root_auth_users: msuchy pingou msuchy sgallagh nb asamalik vgologuz description: copr dispatcher and repo server -volumes: ['-d /dev/vdc vol-00000028'] +volumes: [ {volume_id: '63c3a40c-e228-417a-97a2-e2c34730bf3b', device: '/dev/vdc'} ] +inventory_tenant: persistent +inventory_instance_name: copr-fe +cloud_networks: + # persistent-net + - net-id: "7c705493-f795-4c3a-91d3-c5825c50abfe" + # copr-net + - net-id: "bba5cd9b-8a90-497b-a87f-62372f037620" tcp_ports: [ 22, 80, 443, # These 8 ports are used by fedmsg. One for each wsgi thread. @@ -29,12 +37,3 @@ copr_hostbase: copr-be host_backup_targets: ['/var/lib/copr/public_html/results'] _copr_be_conf: copr-be.conf - -# for the new cloud: -# uncomment after switch -# volumes: [ {volume_id: '63c3a40c-e228-417a-97a2-e2c34730bf3b', device: '/dev/vdc'} ] -cloud_networks: - # persistent-net - - net-id: "7c705493-f795-4c3a-91d3-c5825c50abfe" - # copr-net - - net-id: "bba5cd9b-8a90-497b-a87f-62372f037620" diff --git a/roles/copr/base/files/yum/copr.repo b/roles/copr/base/files/yum/copr.repo index e348b8276f..22f67c0693 100644 --- a/roles/copr/base/files/yum/copr.repo +++ b/roles/copr/base/files/yum/copr.repo @@ -3,7 +3,7 @@ name=Copr failovermethod=priority # and external ip # TODO: update in infra ansible git after copr moved to the new cloud baseurl=file:///var/lib/copr/public_html/results/msuchy/copr/fedora-$releasever-x86_64/ - http://209.132.184.142/results/msuchy/copr/fedora-$releasever-x86_64/ + http://209.132.184.48/results/msuchy/copr/fedora-$releasever-x86_64/ https://copr-be.cloud.fedoraproject.org/results/msuchy/copr/fedora-$releasever-x86_64/ http://172.16.5.5/results/msuchy/copr/fedora-$releasever-x86_64/