Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove fastestmirror_enabled and report_instanceid parameters #103

Merged
merged 1 commit into from
Jun 17, 2018
Merged

Remove fastestmirror_enabled and report_instanceid parameters #103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 6 additions & 20 deletions data/os/RedHat/Amazon.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ yum::os_default_repos:
- 'epel-testing'
- 'epel-testing-debuginfo'
- 'epel-testing-source'

# Upstream repo parameters "fastestmirror_enabled" and "report_instanceid"
# not defined for Amazon Linux default repos as Puppet does not currently
# support them. For more details, see:
# https://tickets.puppetlabs.com/browse/PUP-8730
# https://tickets.puppetlabs.com/browse/PUP-8904
yum::repos:
amzn-main:
descr: "amzn-main-Base"
Expand All @@ -25,13 +31,11 @@ yum::repos:
metadata_expire: 300
priority: 10
failovermethod: "priority"
fastestmirror_enabled: false
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-ga"
enabled: true
retries: 3
timeout: 5
report_instanceid: true
target: "/etc/yum.repos.d/amzn-main.repo"
amzn-main-debuginfo:
descr: "amzn-main-debuginfo"
Expand All @@ -40,13 +44,11 @@ yum::repos:
metadata_expire: 300
priority: 10
failovermethod: "priority"
fastestmirror_enabled: false
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-ga"
enabled: false
retries: 3
timeout: 5
report_instanceid: true
target: "/etc/yum.repos.d/amzn-main.repo"
amzn-main-source:
descr: "amzn-main-source"
Expand All @@ -55,13 +57,11 @@ yum::repos:
metadata_expire: 300
priority: 10
failovermethod: "priority"
fastestmirror_enabled: false
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-ga"
enabled: false
retries: 3
timeout: 5
report_instanceid: true
target: "/etc/yum.repos.d/amzn-main.repo"
amzn-nosrc:
descr: "amzn-nosrc-Base"
Expand All @@ -70,13 +70,11 @@ yum::repos:
metadata_expire: 300
priority: 10
failovermethod: "priority"
fastestmirror_enabled: false
gpgcheck: false
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-ga"
enabled: false
retries: 3
timeout: 5
report_instanceid: true
target: "/etc/yum.repos.d/amzn-nosrc.repo"
amzn-preview:
descr: "amzn-preview-Base"
Expand All @@ -85,13 +83,11 @@ yum::repos:
metadata_expire: 300
priority: 10
failovermethod: "priority"
fastestmirror_enabled: false
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-ga"
enabled: false
retries: 3
timeout: 5
report_instanceid: true
target: "/etc/yum.repos.d/amzn-preview.repo"
amzn-preview-debuginfo:
descr: "amzn-preview-debuginfo"
Expand All @@ -100,13 +96,11 @@ yum::repos:
metadata_expire: 300
priority: 10
failovermethod: "priority"
fastestmirror_enabled: false
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-ga"
enabled: false
retries: 3
timeout: 5
report_instanceid: true
target: "/etc/yum.repos.d/amzn-preview.repo"
amzn-preview-source:
descr: "amzn-preview-source"
Expand All @@ -115,13 +109,11 @@ yum::repos:
metadata_expire: 300
priority: 10
failovermethod: "priority"
fastestmirror_enabled: false
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-ga"
enabled: false
retries: 3
timeout: 5
report_instanceid: true
target: "/etc/yum.repos.d/amzn-preview.repo"
amzn-updates:
descr: "amzn-updates-Base"
Expand All @@ -130,13 +122,11 @@ yum::repos:
metadata_expire: 300
priority: 10
failovermethod: "priority"
fastestmirror_enabled: false
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-ga"
enabled: true
retries: 3
timeout: 5
report_instanceid: true
target: "/etc/yum.repos.d/amzn-updates.repo"
amzn-updates-debuginfo:
descr: "amzn-updates-debuginfo"
Expand All @@ -145,13 +135,11 @@ yum::repos:
metadata_expire: 300
priority: 10
failovermethod: "priority"
fastestmirror_enabled: false
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-ga"
enabled: false
retries: 3
timeout: 5
report_instanceid: true
target: "/etc/yum.repos.d/amzn-updates.repo"
amzn-updates-source:
descr: "amzn-updates-source"
Expand All @@ -160,13 +148,11 @@ yum::repos:
metadata_expire: 300
priority: 10
failovermethod: "priority"
fastestmirror_enabled: false
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-ga"
enabled: false
retries: 3
timeout: 5
report_instanceid: true
target: "/etc/yum.repos.d/amzn-updates.repo"
epel:
descr: "Extra Packages for Enterprise Linux 6 - $basearch"
Expand Down