Skip to content

Allowing for custom yum repo #80

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

Merged
olivielpeau merged 3 commits into from
Oct 24, 2017
Merged

Allowing for custom yum repo #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9bc913
Allowing for custom yum repo
ncracker Oct 4, 2017
5857b0b
var name change
ncracker Oct 23, 2017
00c755a
var names rpm to yum new
ncracker Oct 23, 2017
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
5 changes: 5 additions & 0 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ datadog_group: root
# default apt repo
datadog_apt_repo: "deb http://apt.datadoghq.com/ stable main"

# default yum repo and keys
datadog_yum_repo: "https://yum.datadoghq.com/rpm/{{ ansible_userspace_architecture }}/"
datadog_yum_gpgkey: "https://yum.datadoghq.com/DATADOG_RPM_KEY.public"
datadog_yum_gpgkey_new: "http://yum.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public"

# Pin agent to a version. Highly recommended.
datadog_agent_version: ""

Expand Down
2 changes: 1 addition & 1 deletion tasks/pkg-redhat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- name: Download new RPM key
get_url:
url: "http://yum.datadoghq.com/DATADOG_RPM_KEY_E09422B3.public"
url: "{{ datadog_yum_gpgkey_new }}"
dest: /tmp/DATADOG_RPM_KEY_E09422B3.public
sha256sum: 694a2ffecff85326cc08e5f1a619937999a5913171e42f166e13ec802c812085

Expand Down
6 changes: 3 additions & 3 deletions templates/datadog.repo.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[datadog]
name = Datadog, Inc.
baseurl = https://yum.datadoghq.com/rpm/{{ ansible_userspace_architecture }}/
name=Datadog, Inc.
baseurl={{ datadog_yum_repo }}
enabled=1
gpgcheck=1
gpgkey=https://yum.datadoghq.com/DATADOG_RPM_KEY.public
gpgkey={{ datadog_yum_gpgkey }}