From b8ebb4a8037cd70dfff6059f9a24f3a4639391d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Tue, 31 Mar 2015 13:56:13 +0000
Subject: [PATCH] update copr-fe-dev to point to new Fedora Cloud

---
 .../copr-fe-dev.cloud.fedoraproject.org       | 14 ++++++++---
 playbooks/groups/copr-frontend-newcloud.yml   | 24 ++++++++++++-------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org
index 8de352e893..98f7d50fcb 100644
--- a/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-fe-dev.cloud.fedoraproject.org
@@ -1,14 +1,22 @@
 ---
 instance_type: m1.medium
-image: "{{ f20_qcow_id }}"
+image: "Fedora-Cloud-Base-20141203-21"
 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-fe-dev-
-public_ip: 209.132.184.183
+public_ip: 209.132.184.53
 root_auth_users:  bkabrda ryanlerch pingou msuchy tradej asamalik vgologuz
 description: copr frontend server - dev instance
 tcp_ports: [22, 80, 443]
+# volumes: copr-fe-dev-db
+volumes: [ {volume_id: '74fde12a-7f37-4003-9218-f82fadaf4ea7', device: '/dev/vdc'} ]
+inventory_tenant: persistent
+# name of machine in OpenStack
+inventory_instance_name: copr-fe-dev
+cloud_networks:
+  # persistent-net
+  - net-id: "a4c8289e-eeaa-4070-9ea7-789ed5da6632"
 
 # Copr vars
 copr_hostbase: copr-fe-dev
diff --git a/playbooks/groups/copr-frontend-newcloud.yml b/playbooks/groups/copr-frontend-newcloud.yml
index 89eaacf13b..6737ed3600 100644
--- a/playbooks/groups/copr-frontend-newcloud.yml
+++ b/playbooks/groups/copr-frontend-newcloud.yml
@@ -1,21 +1,27 @@
 - name: check/create instance
-  hosts: copr-front-stg:copr-front
-  #hosts: copr-front
-  user: root
+  #hosts: copr-front-stg:copr-front
+  hosts: copr-front-stg
+  user: fedora
+  sudo: True
   gather_facts: False
 
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
+   - /srv/web/infra/ansible/vars/fedora-cloud.yml
+   - /srv/private/ansible/files/openstack/passwords.yml
 
   tasks:
-  - include: "{{ tasks }}/persistent_cloud.yml"
+  - include: "{{ tasks }}/persistent_cloud_new.yml"
   - include: "{{ tasks }}/growroot_cloud.yml"
 
 
 - name: cloud basic setup
-  hosts: copr-front-stg:copr-front
-  #hosts: copr-front
+  #hosts: copr-front-stg:copr-front
+  hosts: copr-front-stg
+  user: fedora
+  sudo: True
+  gather_facts: True
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
@@ -26,9 +32,9 @@
     shell: "hostname {{copr_hostbase}}.cloud.fedoraproject.org"
 
 - name: provision instance
-  hosts: copr-front:copr-front-stg
-  #hosts: copr-front
-  user: root
+  #hosts: copr-front:copr-front-stg
+  hosts: copr-front-stg
+  user: fedora
   gather_facts: True
 
   vars_files: