From 0b64eb34bf73179068f3962b643a7c92c6edf8c9 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sat, 22 Feb 2020 19:30:33 +0100 Subject: [PATCH] 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 | 7 ++++--- inventory/inventory | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/inventory/group_vars/ec2 b/inventory/group_vars/ec2 index 8cb23e7ae7..b960fe1854 100644 --- a/inventory/group_vars/ec2 +++ b/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 diff --git a/inventory/inventory b/inventory/inventory index cf988e8f74..537cd2f3f9 100644 --- a/inventory/inventory +++ b/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