diff --git a/contrib/setup-gate-mirrors.sh b/contrib/setup-gate-mirrors.sh index 78d024ae..5cff802b 100755 --- a/contrib/setup-gate-mirrors.sh +++ b/contrib/setup-gate-mirrors.sh @@ -28,7 +28,6 @@ mkdir -p $FEDORA_MIN_DIR cat < $FEDORA_MIN_DIR/dib-mirror-fedora.repo [fedora] name=Fedora \$releasever - \$basearch -failovermethod=priority baseurl=$NODEPOOL_FEDORA_MIRROR/releases/\$releasever/Everything/\$basearch/os/ enabled=1 metadata_expire=7d @@ -41,7 +40,6 @@ EOF cat < $FEDORA_MIN_DIR/dib-mirror-fedora-updates.repo [updates] name=Fedora \$releasever - \$basearch - Updates -failovermethod=priority baseurl=$NODEPOOL_FEDORA_MIRROR/updates/\$releasever/Everything/\$basearch/ enabled=1 gpgcheck=0 diff --git a/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo b/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo index 469ed9b9..a9aef2cc 100644 --- a/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo +++ b/diskimage_builder/elements/fedora-minimal/yum.repos.d/yum.repo @@ -1,6 +1,5 @@ [fedora] name=Fedora $releasever - $basearch -failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch gpgcheck=0 @@ -8,7 +7,6 @@ skip_if_unavailable=False [updates] name=Fedora $releasever - $basearch - Updates -failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch enabled=1 diff --git a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 index 5725c665..8aa56dfe 100644 --- a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 +++ b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 @@ -1,6 +1,5 @@ [updates] name=Fedora $releasever - $basearch - Updates -failovermethod=priority baseurl=http://{{ mirror_fqdn }}/fedora/updates/$releasever/Everything/$basearch/ enabled=1 gpgcheck=0 diff --git a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2 b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2 index 74853f8d..b5ca357d 100644 --- a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2 +++ b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2 @@ -1,6 +1,5 @@ [fedora] name=Fedora $releasever - $basearch -failovermethod=priority baseurl=http://{{ mirror_fqdn }}/fedora/releases/$releasever/Everything/$basearch/os/ enabled=1 metadata_expire=7d