From 9223ba3a55b84667bc5a9bb3b1447f66cf7e50f3 Mon Sep 17 00:00:00 2001
From: Valentin Gologuzov <vgologuz@redhat.com>
Date: Tue, 21 Jul 2015 15:42:17 +0200
Subject: [PATCH] [copr][dist-git] using dns names for copr-dist-git hosts

---
 inventory/group_vars/copr-dist-git            |  2 +-
 inventory/host_vars/209.132.184.162           |  3 ---
 .../copr-dist-git-dev.fedorainfracloud.org    | 22 +++++++++++++++++++
 .../copr-dist-git.fedorainfracloud.org        |  0
 inventory/inventory                           |  6 ++++-
 playbooks/groups/copr-dist-git.yml            |  7 +-----
 6 files changed, 29 insertions(+), 11 deletions(-)
 delete mode 100644 inventory/host_vars/209.132.184.162
 create mode 100644 inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org
 create mode 100644 inventory/host_vars/copr-dist-git.fedorainfracloud.org

diff --git a/inventory/group_vars/copr-dist-git b/inventory/group_vars/copr-dist-git
index 4df7e39a11..4c68998422 100644
--- a/inventory/group_vars/copr-dist-git
+++ b/inventory/group_vars/copr-dist-git
@@ -2,4 +2,4 @@
 tcp_ports: [22, 80]
 datacenter: cloud
 freezes: false
-# volumes: []
+
diff --git a/inventory/host_vars/209.132.184.162 b/inventory/host_vars/209.132.184.162
deleted file mode 100644
index f9af6ee4c5..0000000000
--- a/inventory/host_vars/209.132.184.162
+++ /dev/null
@@ -1,3 +0,0 @@
-# TODO: remove this config after copr-dist-git is moved to persistent tenant
-name: copr-dist-git-dev
-volumes: [ {volume_id: '21988d9d-f41e-46c4-b063-1c95df2f9205', device: '/dev/vdc'} ]
diff --git a/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org b/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org
new file mode 100644
index 0000000000..36743af5c9
--- /dev/null
+++ b/inventory/host_vars/copr-dist-git-dev.fedorainfracloud.org
@@ -0,0 +1,22 @@
+---
+instance_type: ms1.small
+image: "{{ CentOS-7-x86_64-GenericCloud-1503 }}"
+keypair: fedora-admin-20130801
+security_group: web-80-anywhere-persistent,ssh-anywhere-persistent,default
+zone: nova
+hostbase: copr-dist-git-dev-
+public_ip: 209.132.184.179
+root_auth_users:  bkabrda ryanlerch pingou msuchy tradej asamalik vgologuz frostyx
+description: dist-git for copr service - dev instance
+tcp_ports: [22, 80]
+# volumes:  copr-dist-git-dev
+volumes: [ {volume_id: '64f21445-d758-4b19-8401-e497cd0ae012', device: '/dev/vdc'} ]
+inventory_tenant: persistent
+# name of machine in OpenStack
+inventory_instance_name: copr-dist-git-dev
+cloud_networks:
+  # persistent-net
+  - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
+
+# Copr vars
+copr_hostbase: copr-dist-git-dev
diff --git a/inventory/host_vars/copr-dist-git.fedorainfracloud.org b/inventory/host_vars/copr-dist-git.fedorainfracloud.org
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/inventory/inventory b/inventory/inventory
index 3aa0fecdd1..def4cb1914 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -929,8 +929,12 @@ copr-fe.cloud.fedoraproject.org
 [copr-back]
 copr-be.cloud.fedoraproject.org
 
+# todo: when finished add to copr/copr-stg groups
+[copr-dist-git]
+copr-dist-git.fedorainfracloud.org
+
 [copr-dist-git-stg]
-209.132.184.162
+copr-dist-git-stg.fedorainfracloud.org
 
 [copr:children]
 copr-front
diff --git a/playbooks/groups/copr-dist-git.yml b/playbooks/groups/copr-dist-git.yml
index dab6bf767e..9e99178b4c 100644
--- a/playbooks/groups/copr-dist-git.yml
+++ b/playbooks/groups/copr-dist-git.yml
@@ -1,6 +1,5 @@
 - name: check/create instance
   hosts: copr-dist-git-stg:copr-dist-git
-
   user: centos
   sudo: True
   gather_facts: False
@@ -12,13 +11,9 @@
    - /srv/private/ansible/files/openstack/passwords.yml
 
   tasks:
-  # - include: "{{ tasks }}/persistend_cloud_new.yml"
+  - include: "{{ tasks }}/persistend_cloud_new.yml"
   - include: "{{ tasks }}/growroot_cloud.yml"
   # TODO: remove when copr-dist-git will be deployed to the persistent tenant
-  - local_action: shell nova --os-auth-url="{{os_auth_url}}" --os-username="admin" --os-password="{{ADMIN_PASS}}" --os-tenant-name={{inventory_tenant}} volume-list | grep ' {{item.volume_id}} ' | grep 'available' && nova --os-auth-url="{{os_auth_url}}" --os-username="admin" --os-password="{{ADMIN_PASS}}" --os-tenant-name={{inventory_tenant}} volume-attach "{{inventory_instance_name}}" "{{item.volume_id}}" "{{item.device}}"
-    with_items: volumes
-    ignore_errors: yes
-    when: volumes is defined
 
 - name: cloud basic setup
   hosts: copr-dist-git-stg:copr-dist-git