diff --git a/roles/copr/backend/files/provision/_provision_aarch64.yml b/roles/copr/backend/files/provision/_provision_aarch64.yml index 42837a8ce8..f085e9cb06 100644 --- a/roles/copr/backend/files/provision/_provision_aarch64.yml +++ b/roles/copr/backend/files/provision/_provision_aarch64.yml @@ -8,6 +8,7 @@ remote_user: root vars_files: + - vars.yml - nova_cloud_vars.yml vars: prepare_base_image: False diff --git a/roles/copr/backend/files/provision/builderpb_libvirt_aarch64.yml b/roles/copr/backend/files/provision/builderpb_libvirt_aarch64.yml index f9ac5ac07f..16c3979458 100644 --- a/roles/copr/backend/files/provision/builderpb_libvirt_aarch64.yml +++ b/roles/copr/backend/files/provision/builderpb_libvirt_aarch64.yml @@ -3,6 +3,9 @@ gather_facts: False connection: local + vars_files: + - vars.yml + tasks: - name: spin machine with script local_action: shell /bin/bash ./vm-aarch64-alloc diff --git a/roles/copr/backend/files/provision/builderpb_nova.yml b/roles/copr/backend/files/provision/builderpb_nova.yml index 272ccb383c..7f930e7f3b 100644 --- a/roles/copr/backend/files/provision/builderpb_nova.yml +++ b/roles/copr/backend/files/provision/builderpb_nova.yml @@ -3,6 +3,7 @@ gather_facts: False vars_files: + - vars.yml - nova_cloud_vars.yml vars: @@ -38,6 +39,7 @@ user: fedora vars_files: + - vars.yml - nova_cloud_vars.yml vars: diff --git a/roles/copr/backend/files/provision/builderpb_nova_ppc64le.yml b/roles/copr/backend/files/provision/builderpb_nova_ppc64le.yml index 01a5346e59..104155a3bb 100644 --- a/roles/copr/backend/files/provision/builderpb_nova_ppc64le.yml +++ b/roles/copr/backend/files/provision/builderpb_nova_ppc64le.yml @@ -3,6 +3,7 @@ gather_facts: False vars_files: + - vars.yml - nova_cloud_vars.yml vars: @@ -38,6 +39,7 @@ user: fedora vars_files: + - vars.yml - nova_cloud_vars.yml vars: diff --git a/roles/copr/backend/files/provision/terminatepb_nova.yml b/roles/copr/backend/files/provision/terminatepb_nova.yml index 80794dec85..0705ff6542 100644 --- a/roles/copr/backend/files/provision/terminatepb_nova.yml +++ b/roles/copr/backend/files/provision/terminatepb_nova.yml @@ -3,6 +3,7 @@ gather_facts: False vars_files: + - vars.yml - nova_cloud_vars.yml tasks: diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 3ae25b616f..ab3c5ad9a3 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -153,7 +153,12 @@ - provision_config - name: put some files into the provision subdir - template: src="provision/nova_cloud_vars.yml" dest="/home/copr/provision/nova_cloud_vars.yml" owner=copr group=copr + template: + src: "provision/{{ item }}" + dest: "/var/lib/resallocserver/provision/{{ item }}" + with_items: + - vars.yml + - nova_cloud_vars.yml tags: - provision_config diff --git a/roles/copr/backend/tasks/resalloc.yml b/roles/copr/backend/tasks/resalloc.yml index ac37e66dba..ed42f09839 100644 --- a/roles/copr/backend/tasks/resalloc.yml +++ b/roles/copr/backend/tasks/resalloc.yml @@ -13,10 +13,13 @@ tags: - provision_config -- name: resalloc, nova_cloud_vars +- name: resalloc, generate vars files template: - src: provision/nova_cloud_vars.yml - dest: /var/lib/resallocserver/provision/nova_cloud_vars.yml + src: "provision/{{ item }}" + dest: "/var/lib/resallocserver/provision/{{ item }}" + with_items: + - vars.yml + - nova_cloud_vars.yml tags: - provision_config diff --git a/roles/copr/backend/templates/provision/vars.yml b/roles/copr/backend/templates/provision/vars.yml new file mode 100644 index 0000000000..a3f60e1c45 --- /dev/null +++ b/roles/copr/backend/templates/provision/vars.yml @@ -0,0 +1,2 @@ +--- +devel: {% if devel %}true{% else %}false{% endif %}