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 f4c4c7eb11..dbe43ea1d2 100644 --- a/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml +++ b/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml @@ -13,7 +13,6 @@ keypair: copr-builder instance_type: i3.large security_group: ssh-only - region: us-east-1 max_spawn_time: 1100 spawning_vm_user: "fedora" image_name: "{{ builder_images.x86_64 }}" @@ -29,7 +28,7 @@ instance_type: "{{ instance_type }}" image: "{{ image_name }}" wait: true - region: "{{ region }}" + region: "{{ aws_region }}" vpc_subnet_id: subnet-01d4e967ab5e78005 assign_public_ip: yes instance_tags: diff --git a/roles/copr/backend/files/provision/terminatepb-aws.yml b/roles/copr/backend/files/provision/terminatepb-aws.yml new file mode 100644 index 0000000000..81175fd1f7 --- /dev/null +++ b/roles/copr/backend/files/provision/terminatepb-aws.yml @@ -0,0 +1,26 @@ +- name: terminate instance + hosts: 127.0.0.1 + gather_facts: False + + vars_files: + - vars.yml + - nova_cloud_vars.yml + + tasks: + - local_action: + module: ec2 + instance_tags: + Name: "{{ copr_task.vm_name }}" + region: "{{ aws_region }}" + state: running + aws_access_key: "{{ aws_access_key }}" + aws_secret_key: "{{ aws_secret_key }}" + register: ec2 + + - local_action: + module: ec2 + region: "{{ aws_region }}" + state: absent + instance_ids: "{{ ec2.instance_ids }}" + aws_access_key: "{{ aws_access_key }}" + aws_secret_key: "{{ aws_secret_key }}" diff --git a/roles/copr/backend/templates/provision/aws_cloud_vars.yml b/roles/copr/backend/templates/provision/aws_cloud_vars.yml index bd102cb743..9e44c25bfb 100644 --- a/roles/copr/backend/templates/provision/aws_cloud_vars.yml +++ b/roles/copr/backend/templates/provision/aws_cloud_vars.yml @@ -1,5 +1,7 @@ aws_access_key: {{ copr_aws_access_key_id }} aws_secret_key: {{ copr_aws_secret_access_key }} +aws_region: us-east-1 + builder_images: x86_64: "{{ copr_builder_images.aws.x86_64 }}"