From 25f7ff721ea9da36cb91b92e2508d5d9dbef82b0 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 21 Feb 2020 22:36:03 +0100 Subject: [PATCH] copr_*aws: don't override service_enabled array from Fedora.yml ... and sync the two files. --- inventory/group_vars/copr_aws | 7 ++----- inventory/group_vars/copr_dev_aws | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/inventory/group_vars/copr_aws b/inventory/group_vars/copr_aws index 8bbe926f5e..bbf399e7e7 100644 --- a/inventory/group_vars/copr_aws +++ b/inventory/group_vars/copr_aws @@ -4,6 +4,8 @@ datacenter: aws _forward_src: "forward" +# don't forget to update ip in ./copr-keygen, due to custom firewall rules + # eth0, eth1 copr_backend_ips: ["34.227.76.72", "172.30.2.166"] keygen_host: "52.202.64.55" @@ -20,8 +22,3 @@ copr_aws_region: us-east-1 services_disabled: true nm_controlled_resolv: True - -baseiptables: False - -# override defaults from vars/Fedora.yml -service_enabled: [] diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws index 0401de59b1..34b49dff17 100644 --- a/inventory/group_vars/copr_dev_aws +++ b/inventory/group_vars/copr_dev_aws @@ -3,7 +3,6 @@ devel: true datacenter: aws -#_forward-src: "{{ files }}/copr/forward-dev" _forward_src: "forward_dev" # don't forget to update ip in ./copr-keygen-stg, due to custom firewall rules @@ -24,6 +23,3 @@ copr_aws_region: us-east-1 services_disabled: false nm_controlled_resolv: True - -# override defaults from vars/Fedora.yml -#service_enabled: []