From f0a17f6e23ff6437bd3e4807c272a3df3eac0162 Mon Sep 17 00:00:00 2001
From: Valentin Gologuzov <vgologuz@redhat.com>
Date: Fri, 3 Apr 2015 16:28:09 +0200
Subject: [PATCH] [copr] deploy builderpb-s correctly

---
 .../{templates => files}/provision/builderpb_nova.yml    | 4 ----
 .../provision/provision_builder_tasks.yml                | 0
 .../{templates => files}/provision/spinup_nova_task.yml  | 0
 .../{templates => files}/provision/terminatepb.yml       | 0
 roles/copr/backend/tasks/main.yml                        | 9 +++------
 .../copr/backend/templates/provision/nova_cloud_vars.yml | 4 ++++
 6 files changed, 7 insertions(+), 10 deletions(-)
 rename roles/copr/backend/{templates => files}/provision/builderpb_nova.yml (89%)
 rename roles/copr/backend/{templates => files}/provision/provision_builder_tasks.yml (100%)
 rename roles/copr/backend/{templates => files}/provision/spinup_nova_task.yml (100%)
 rename roles/copr/backend/{templates => files}/provision/terminatepb.yml (100%)

diff --git a/roles/copr/backend/templates/provision/builderpb_nova.yml b/roles/copr/backend/files/provision/builderpb_nova.yml
similarity index 89%
rename from roles/copr/backend/templates/provision/builderpb_nova.yml
rename to roles/copr/backend/files/provision/builderpb_nova.yml
index 512d6c46e3..717728c038 100644
--- a/roles/copr/backend/templates/provision/builderpb_nova.yml
+++ b/roles/copr/backend/files/provision/builderpb_nova.yml
@@ -8,10 +8,6 @@
   vars:
     # _OS_AUTH_OPTS: "--os-auth-url {{OS_AUTH_URL}} --os-username {{OS_USERNAME}} --os-password {{OS_PASSWORD}} --os-tenant-name {{OS_TENANT_NAME}} --os-tenant-id {{OS_TENANT_ID}} "
 
-    image_name: "{{ copr_builder_image_name }}"
-    flavor_name: "{{ copr_builder_flavor_name }}"
-
-    network_name: "{{ copr_builder_network_name }}"
     keypair: buildsys
     max_spawn_time: 600
     spawning_vm_user: "fedora"
diff --git a/roles/copr/backend/templates/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml
similarity index 100%
rename from roles/copr/backend/templates/provision/provision_builder_tasks.yml
rename to roles/copr/backend/files/provision/provision_builder_tasks.yml
diff --git a/roles/copr/backend/templates/provision/spinup_nova_task.yml b/roles/copr/backend/files/provision/spinup_nova_task.yml
similarity index 100%
rename from roles/copr/backend/templates/provision/spinup_nova_task.yml
rename to roles/copr/backend/files/provision/spinup_nova_task.yml
diff --git a/roles/copr/backend/templates/provision/terminatepb.yml b/roles/copr/backend/files/provision/terminatepb.yml
similarity index 100%
rename from roles/copr/backend/templates/provision/terminatepb.yml
rename to roles/copr/backend/files/provision/terminatepb.yml
diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml
index ce0b4ebe1b..cf84d3e493 100644
--- a/roles/copr/backend/tasks/main.yml
+++ b/roles/copr/backend/tasks/main.yml
@@ -115,12 +115,9 @@
 
 - name: put some files into the provision subdir
   template: src="provision/{{ item }}" dest="/home/copr/provision/{{ item }}"
-  with_fileglob:
-  - provision/*.yml
-  #with_items:
-  #- inventory
-  #- builderpb.yml
-  #- terminatepb.yml
+  with_items:
+  - inventory
+  - nova_cloud_vars.yml
   tags:
   - provision_config
 
diff --git a/roles/copr/backend/templates/provision/nova_cloud_vars.yml b/roles/copr/backend/templates/provision/nova_cloud_vars.yml
index e6bfc16858..57e6c4fd1c 100644
--- a/roles/copr/backend/templates/provision/nova_cloud_vars.yml
+++ b/roles/copr/backend/templates/provision/nova_cloud_vars.yml
@@ -7,3 +7,7 @@ OS_TENANT_NAME: "{{ copr_builders_os_tenant_name }}"
 OS_USERNAME: "{{ copr_builders_os_username }}"
 OS_PASSWORD: "{{ copr_password }}"
 
+
+image_name: "{{ copr_builder_image_name }}"
+flavor_name: "{{ copr_builder_flavor_name }}"
+network_name: "{{ copr_builder_network_name }}"