From 3a17e3698a32c5428a1fc12581750008c2206edb Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Tue, 25 Aug 2020 11:30:27 +0200
Subject: [PATCH] copr-be: move the aws_arch_subnets config to proper place

The provision playbook is run on backend, not on batcave - so it was
actually not accessible after b4b963d03720f5974e6840e5484e64bbd25c2d5f.
---
 inventory/group_vars/copr_all_instances_aws    | 18 +-----------------
 .../templates/provision/aws_cloud_vars.yml     | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/inventory/group_vars/copr_all_instances_aws b/inventory/group_vars/copr_all_instances_aws
index 6888169ffe..9c230a9149 100644
--- a/inventory/group_vars/copr_all_instances_aws
+++ b/inventory/group_vars/copr_all_instances_aws
@@ -1,17 +1 @@
-# Your requested instance type (a1.xlarge) is not supported in your requested Availability Zone (us-east-1a).
-# Your requested instance type (a1.xlarge) is not supported in your requested Availability Zone (us-east-1d).
-# Your requested instance type (a1.xlarge) is not supported in your requested Availability Zone (us-east-1f).
-
-aws_arch_subnets:
-  x86_64:
-    - subnet-0995f6a466849f4c3
-    - subnet-08cadf5a14b530ac4
-    - subnet-07b0b3168a353e3ee
-    - subnet-09c74a3e6420a206b
-    - subnet-01d4e967ab5e78005
-    - subnet-05437ac82d63b6ef5
-
-  aarch64:
-    - subnet-0995f6a466849f4c3
-    - subnet-08cadf5a14b530ac4
-    - subnet-07b0b3168a353e3ee
+# Put here configuration for all copr instances (production, devel, ...)
diff --git a/roles/copr/backend/templates/provision/aws_cloud_vars.yml b/roles/copr/backend/templates/provision/aws_cloud_vars.yml
index f406962d56..b7972df62a 100644
--- a/roles/copr/backend/templates/provision/aws_cloud_vars.yml
+++ b/roles/copr/backend/templates/provision/aws_cloud_vars.yml
@@ -8,3 +8,20 @@ builder_images:
   aarch64: "{{ copr_builder_images.aws.aarch64 }}"
 
 mock_var_cache_tmpfs: true
+
+aws_arch_subnets:
+  x86_64:
+    - subnet-0995f6a466849f4c3
+    - subnet-08cadf5a14b530ac4
+    - subnet-07b0b3168a353e3ee
+    - subnet-09c74a3e6420a206b
+    - subnet-01d4e967ab5e78005
+    - subnet-05437ac82d63b6ef5
+
+  # Your requested instance type (a1.xlarge) is not supported in your requested Availability Zone (us-east-1a).
+  # Your requested instance type (a1.xlarge) is not supported in your requested Availability Zone (us-east-1d).
+  # Your requested instance type (a1.xlarge) is not supported in your requested Availability Zone (us-east-1f).
+  aarch64:
+    - subnet-0995f6a466849f4c3
+    - subnet-08cadf5a14b530ac4
+    - subnet-07b0b3168a353e3ee