diff --git a/inventory/group_vars/copr_all_instances_aws b/inventory/group_vars/copr_all_instances_aws index 5b9fe53723..ca41fb2eef 100644 --- a/inventory/group_vars/copr_all_instances_aws +++ b/inventory/group_vars/copr_all_instances_aws @@ -12,3 +12,5 @@ additional_known_hosts_cleanup: - copr-be-dev-temp.aws.fedoraproject.org copr-be.aws.fedoraproject.org: - copr-be-temp.aws.fedoraproject.org + +aws_ipv6_con: "cloud-init eth0" diff --git a/inventory/group_vars/copr_pulp_dev_aws b/inventory/group_vars/copr_pulp_dev_aws index b1d7a576d2..33bf0e803d 100644 --- a/inventory/group_vars/copr_pulp_dev_aws +++ b/inventory/group_vars/copr_pulp_dev_aws @@ -1,3 +1,3 @@ --- services_disabled: true -aws_ipv6_addr: "2600:1f18:8ee:ae00:c4b7:de1a:4d13:e5a4" +aws_ipv6_addr: "2600:1f18:8ee:ae00:c607:4520:249f:6cc8" diff --git a/inventory/host_vars/copr-pulp-dev.aws.fedoraproject.org b/inventory/host_vars/copr-pulp-dev.aws.fedoraproject.org index 80a8e4db14..482c4394e6 100644 --- a/inventory/host_vars/copr-pulp-dev.aws.fedoraproject.org +++ b/inventory/host_vars/copr-pulp-dev.aws.fedoraproject.org @@ -18,3 +18,5 @@ tcp_ports: [ # PULP API 24817, ] + +aws_ipv6_con: "System eth0" diff --git a/inventory/host_vars/copr-pulp.aws.fedoraproject.org b/inventory/host_vars/copr-pulp.aws.fedoraproject.org index f05572dbeb..16eba8df35 100644 --- a/inventory/host_vars/copr-pulp.aws.fedoraproject.org +++ b/inventory/host_vars/copr-pulp.aws.fedoraproject.org @@ -14,3 +14,5 @@ nagios_Can_Connect: false public_ip: TODO swap_file_path: /swap swap_file_size_mb: 8096 + +aws_ipv6_con: "System eth0" diff --git a/roles/copr/base/tasks/main.yml b/roles/copr/base/tasks/main.yml index 6f179d0de3..75939a1ab9 100644 --- a/roles/copr/base/tasks/main.yml +++ b/roles/copr/base/tasks/main.yml @@ -100,7 +100,7 @@ - ansible_distribution == 'Fedora' - name: disable offloading (persitently) - shell: "nmcli con modify 'cloud-init eth0' ethtool.feature-tso off ethtool.feature-gro off ethtool.feature-gso off" + shell: "nmcli con modify '{{ aws_ipv6_con }}' ethtool.feature-tso off ethtool.feature-gro off ethtool.feature-gso off" when: - offloading.rc == 0 - ansible_distribution == 'Fedora' @@ -108,7 +108,7 @@ - config - name: check we have the needed ipv6 - shell: "nmcli con show 'cloud-init eth0' | grep ipv6.addresses | grep {{ aws_ipv6_addr }}" + shell: "nmcli con show '{{ aws_ipv6_con }}' | grep ipv6.addresses | grep {{ aws_ipv6_addr }}" register: ipv6_config_check failed_when: false changed_when: ipv6_config_check.rc == 1