copr-be/copr-fe: move more provision tasks on one place

roles/copr/backend/tasks/main.yml

@@ -179,35 +179,11 @@
   tags:
   - provision_config
 
-- name: put provisioning files
+- name: setup provision directory
-  synchronize: src="provision/" dest="/home/copr/provision/"
+  include_tasks: setup_provisioning_environment.yml
-  tags:
+  vars:
-  - provision_config
+    cloud_vars: true
-
+    provision_directory: /home/copr/provision
-- name: "put provisioning files [remove mock config leftovers]"
-  synchronize: src="provision/files/mock/" dest="/home/copr/provision/files/mock/"
-               delete=yes
-  tags:
-  - provision_config
-
-- name: put some files into the provision subdir
-  template:
-    src: "provision/{{ item }}"
-    dest: "/home/copr/provision/{{ item }}"
-  with_items:
-  - vars.yml
-  - nova_cloud_vars.yml
-  - aws_cloud_vars.yml
-  tags:
-  - provision_config
-
-- name: put copr-rpmbuild configuration file into the provision subdir
-  template: src="provision/copr-rpmbuild/main.ini.j2" dest="/home/copr/provision/files/main.ini" owner=copr group=copr
-  tags:
-  - provision_config
-
-- name: put rpkg configuration file into the provision subdir
-  template: src="provision/rpkg.conf.j2" dest="/home/copr/provision/files/rpkg.conf" owner=copr group=copr
   tags:
   - provision_config
 

roles/copr/backend/tasks/resalloc.yml

@@ -40,30 +40,8 @@
   include_tasks: setup_provisioning_environment.yml
   tags:
   - provision_config
-
+  vars:
-- name: resalloc, generate cloud-oriented vars files
+    cloud_vars: true
-  template:
-    src: "{{ roles_path }}/copr/backend/templates/provision/{{ item }}"
-    dest: "{{ provision_directory }}/{{ item }}"
-  with_items:
-  - nova_cloud_vars.yml
-  - aws_cloud_vars.yml
-  tags:
-  - provision_config
-
-- name: resalloc, rpmbuild config
-  template:
-    src: "{{ roles_path }}/copr/backend/templates/provision/copr-rpmbuild/main.ini.j2"
-    dest: "{{ provision_directory }}/files/main.ini"
-  tags:
-  - provision_config
-
-- name: resalloc, rpkg config
-  template:
-    src: "{{ roles_path }}/copr/backend/templates/provision/rpkg.conf.j2"
-    dest: "{{ provision_directory }}/files/rpkg.conf"
-  tags:
-  - provision_config
 
 - name: install .ansible.cfg for {{ provision_user }} user
   copy: src=ansible.cfg dest=/var/lib/resallocserver/.ansible.cfg

roles/copr/backend/tasks/setup_provisioning_environment.yml

@@ -22,3 +22,27 @@
   - vars.yml
   tags:
   - provision_config
+
+- name: generate cloud-oriented vars files
+  template:
+    src: "{{ roles_path }}/copr/backend/templates/provision/{{ item }}"
+    dest: "{{ provision_directory }}/{{ item }}"
+  with_items:
+  - nova_cloud_vars.yml
+  - aws_cloud_vars.yml
+  tags:
+  - provision_config
+  when:
+  - cloud_vars is defined and cloud_vars
+
+- name: put copr-rpmbuild configuration file into the provision subdir
+  template: src="{{ roles_path }}/copr/backend/templates/provision/copr-rpmbuild/main.ini.j2"
+            dest="{{ provision_directory }}/files/main.ini"
+  tags:
+  - provision_config
+
+- name: put rpkg configuration file into the provision subdir
+  template: src="{{ roles_path }}/copr/backend/templates/provision/rpkg.conf.j2"
+            dest="{{ provision_directory }}/files/rpkg.conf"
+  tags:
+  - provision_config