copr: put copr*aws boxes back to ec2 group

(and disable ansible_become* hacks in ec2 group)

https://pagure.io/fedora-infrastructure/issue/8675

inventory/group_vars/ec2

@@ -1,8 +1,9 @@
 # For Fedora instances, we want to ssh as 'fedora', not as 'root'
 #ansible_ssh_user: fedora
-ansible_become: true
-ansible_become_user: root
-ansible_become_method: sudo
+# Disabled, it was only needed initially for proxy30.fedoraproject.org
+#ansible_become: true
+#ansible_become_user: root
+#ansible_become_method: sudo
 
 # Disable ethX ifcfg, let amazon handle these via DHCP.
 ansible_ifcfg_blacklist: true

inventory/inventory

@@ -1416,15 +1416,15 @@ os-proxy02.fedorainfracloud.org
 
 [ec2]
 proxy30.fedoraproject.org
-#copr-be.aws.fedoraproject.org
-#copr-be-dev.aws.fedoraproject.org
-#copr-dist-git.aws.fedoraproject.org
-#copr-dist-git-dev.aws.fedoraproject.org
-#copr-fe.aws.fedoraproject.org
-#copr-fe-dev.aws.fedoraproject.org
-#copr-keygen.aws.fedoraproject.org
-#copr-keygen-dev.aws.fedoraproject.org
-#copr-be-dev.cloud.fedoraproject.org
-#copr-dist-git-dev.fedorainfracloud.org
-#copr-fe-dev.cloud.fedoraproject.org
-#copr-keygen-dev.cloud.fedoraproject.org
+copr-be.aws.fedoraproject.org
+copr-be-dev.aws.fedoraproject.org
+copr-dist-git.aws.fedoraproject.org
+copr-dist-git-dev.aws.fedoraproject.org
+copr-fe.aws.fedoraproject.org
+copr-fe-dev.aws.fedoraproject.org
+copr-keygen.aws.fedoraproject.org
+copr-keygen-dev.aws.fedoraproject.org
+copr-be-dev.cloud.fedoraproject.org
+copr-dist-git-dev.fedorainfracloud.org
+copr-fe-dev.cloud.fedoraproject.org
+copr-keygen-dev.cloud.fedoraproject.org