From 04436f23d173300140643f4954cca1a9c3a9d4ee Mon Sep 17 00:00:00 2001
From: Valentin Gologuzov <vgologuz@redhat.com>
Date: Tue, 19 May 2015 12:17:20 +0200
Subject: [PATCH] [copr] migrating copr-keygen production to the new cloud

---
 inventory/group_vars/copr                     |  9 +++++--
 inventory/group_vars/copr-keygen              |  4 +--
 .../copr-keygen.cloud.fedoraproject.org       | 26 ++++++++++++++-----
 inventory/inventory                           |  4 ++-
 playbooks/groups/copr-keygen-newcloud.yml     |  6 ++---
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/inventory/group_vars/copr b/inventory/group_vars/copr
index 542d86a319..ac20155a72 100644
--- a/inventory/group_vars/copr
+++ b/inventory/group_vars/copr
@@ -3,8 +3,13 @@ devel: false
 _forward_src: "forward"
 
 # don't forget to update ip in ./copr-keygen, due to custom firewall rules
-copr_backend_ips: "172.25.80.3 209.132.184.48"
-keygen_host: "172.16.5.25"
+# old cloud
+##copr_backend_ips: "172.25.80.3 209.132.184.48"
+##keygen_host: "172.16.5.25"
+copr_backend_ips: "172.25.32.19 209.132.184.48"
+keygen_host: "172.16.5.25"  # wrong one, update me please
+
+
 resolvconf: "resolv.conf/cloud"
 
 backend_base_url: "https://copr-be.cloud.fedoraproject.org"
diff --git a/inventory/group_vars/copr-keygen b/inventory/group_vars/copr-keygen
index 8d8baace2d..be1fdc428e 100644
--- a/inventory/group_vars/copr-keygen
+++ b/inventory/group_vars/copr-keygen
@@ -2,9 +2,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',
+custom_rules: [ '-A INPUT -p tcp -m tcp -s 172.16.32.19 --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 172.16.32.19 --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-keygen.cloud.fedoraproject.org b/inventory/host_vars/copr-keygen.cloud.fedoraproject.org
index 4e626f8b82..bb930a7083 100644
--- a/inventory/host_vars/copr-keygen.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-keygen.cloud.fedoraproject.org
@@ -1,16 +1,28 @@
 ---
-instance_type: m1.small
-image: "{{ f20_qcow_id }}"
+instance_type: ms1.small
+image: "{{ fedora21_x86_64 }}"
 keypair: fedora-admin-20130801
 zone: nova
 hostbase: copr-keygen-
-public_ip: 209.132.184.159
+# public_ip: 209.132.184.159
+public_ip: 209.132.184.49
 root_auth_users: msuchy vgologuz
 description: copr key gen instance
-volumes: ['-d /dev/vdc vol-0000002e']
-security_group: default
+# volumes: ['-d /dev/vdc vol-0000002e']
+volumes: []
+# security_group: default
+security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default,allow-nagios-persistent
+
+inventory_tenant: persistent
+# name of machine in OpenStack
+inventory_instance_name: copr-keygen
+cloud_networks:
+  # persistent-net
+  - net-id: "7c705493-f795-4c3a-91d3-c5825c50abfe"
+
 
 host_backup_targets: ['/backup/']
-
-copr_hostbase: copr-keygen
 datacenter: cloud
+
+# Copr vars
+copr_hostbase: copr-keygen
diff --git a/inventory/inventory b/inventory/inventory
index eecede0246..c94caae16f 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -881,7 +881,9 @@ copr-be-dev.cloud.fedoraproject.org
 
 # temporary
 [copr-keygen]
-copr-keygen.cloud.fedoraproject.org
+209.132.184.49
+# return hostname after DNS update
+#copr-keygen.cloud.fedoraproject.org
 
 [copr-front]
 copr-fe.cloud.fedoraproject.org
diff --git a/playbooks/groups/copr-keygen-newcloud.yml b/playbooks/groups/copr-keygen-newcloud.yml
index e588f946cc..f685039bac 100644
--- a/playbooks/groups/copr-keygen-newcloud.yml
+++ b/playbooks/groups/copr-keygen-newcloud.yml
@@ -1,6 +1,6 @@
 - name: check/create instance
   #hosts: copr-keygen-stg:copr-keygen
-  hosts: copr-keygen-stg
+  hosts: copr-keygen
   user: fedora
   sudo: True
   gather_facts: False
@@ -24,7 +24,7 @@
 
 - name: cloud basic setup
   #hosts: copr-keygen-stg:copr-keygen
-  hosts: copr-keygen-stg
+  hosts: copr-keygen
   user: fedora
   sudo: True
   gather_facts: True
@@ -39,7 +39,7 @@
 
 - name: provision instance
   #hosts: copr-keygen:copr-keygen-stg
-  hosts: copr-keygen-stg
+  hosts: copr-keygen
   user: fedora
   sudo: True
   gather_facts: True