From e764437f936558fe148e2db9e6ab7ff60c666923 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 19 Nov 2019 15:13:39 +0100 Subject: [PATCH] copr: aws: move aws credentials to aws_cloud_vars --- roles/copr/backend/files/provision/builderpb-aws-x86_64.yml | 2 ++ roles/copr/backend/templates/provision/aws_cloud_vars.yml | 3 +++ roles/copr/backend/templates/provision/vars.yml | 3 --- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml b/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml index 1ab4fbd4c1..4739c14132 100644 --- a/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml +++ b/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml @@ -36,6 +36,8 @@ FedoraGroup: copr Name: "{{ vm_name }}" arch: "{{ arch }}" + aws_access_key: {{ aws_access_key }} + aws_secret_key: {{ aws_secret_key }} register: ec2 - name: Add new instance to host group diff --git a/roles/copr/backend/templates/provision/aws_cloud_vars.yml b/roles/copr/backend/templates/provision/aws_cloud_vars.yml index 25ea8ea29b..bd102cb743 100644 --- a/roles/copr/backend/templates/provision/aws_cloud_vars.yml +++ b/roles/copr/backend/templates/provision/aws_cloud_vars.yml @@ -1,2 +1,5 @@ +aws_access_key: {{ copr_aws_access_key_id }} +aws_secret_key: {{ copr_aws_secret_access_key }} + builder_images: x86_64: "{{ copr_builder_images.aws.x86_64 }}" diff --git a/roles/copr/backend/templates/provision/vars.yml b/roles/copr/backend/templates/provision/vars.yml index 34c949c412..ecaa38465e 100644 --- a/roles/copr/backend/templates/provision/vars.yml +++ b/roles/copr/backend/templates/provision/vars.yml @@ -3,6 +3,3 @@ devel: {% if devel %}true{% else %}false{% endif %} {# 2015-07-09T16:59:26.896629Z => 20150709_165926_896629 #} builder_uniq_suffix: "{{ '{{' }} ansible_date_time.iso8601_micro | regex_replace('[-:Z]', '') | regex_replace('[T\\.]', '_') }}" - -aws_access_key: {{ copr_aws_access_key_id }} -aws_secret_key: {{ copr_aws_secret_access_key }}