From 5a64bb37270c6d47a5d1c8ef28ab12c8dc129ec1 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 25 Nov 2019 10:51:24 +0100 Subject: [PATCH] copr: add aws region to configuration --- inventory/group_vars/copr | 2 ++ inventory/group_vars/copr_dev | 2 ++ roles/copr/backend/templates/aws-config | 2 +- roles/copr/backend/templates/provision/aws_cloud_vars.yml | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/copr b/inventory/group_vars/copr index cbf790dcbb..cdede6b4e7 100644 --- a/inventory/group_vars/copr +++ b/inventory/group_vars/copr @@ -18,4 +18,6 @@ dist_git_base_url: "copr-dist-git.fedorainfracloud.org" ansible_ifcfg_blacklist: true +copr_aws_region: us-east-1 + datacenter: cloud diff --git a/inventory/group_vars/copr_dev b/inventory/group_vars/copr_dev index 2ef2db91a3..eccbad6391 100644 --- a/inventory/group_vars/copr_dev +++ b/inventory/group_vars/copr_dev @@ -18,3 +18,5 @@ frontend_base_url: "https://copr-fe-dev.cloud.fedoraproject.org" dist_git_base_url: "copr-dist-git-dev.fedorainfracloud.org" ansible_ifcfg_blacklist: true + +copr_aws_region: us-east-1 diff --git a/roles/copr/backend/templates/aws-config b/roles/copr/backend/templates/aws-config index ee8f7ce735..f71ed67983 100644 --- a/roles/copr/backend/templates/aws-config +++ b/roles/copr/backend/templates/aws-config @@ -1,3 +1,3 @@ [default] -region = us-east-1 +region = {{ copr_aws_region }} output = json diff --git a/roles/copr/backend/templates/provision/aws_cloud_vars.yml b/roles/copr/backend/templates/provision/aws_cloud_vars.yml index 9e44c25bfb..40e0552004 100644 --- a/roles/copr/backend/templates/provision/aws_cloud_vars.yml +++ b/roles/copr/backend/templates/provision/aws_cloud_vars.yml @@ -1,7 +1,7 @@ aws_access_key: {{ copr_aws_access_key_id }} aws_secret_key: {{ copr_aws_secret_access_key }} -aws_region: us-east-1 +aws_region: {{ copr_aws_region }} builder_images: x86_64: "{{ copr_builder_images.aws.x86_64 }}"