Skip to content

Commit 742c2bf

Browse files
pid1truthbk
authored andcommitted
Use full key ID when adding GPG keys on Ubuntu (DataDog#329)
* Use the full key fingerprint * Fix failing Travis check
1 parent 78fe5ee commit 742c2bf

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

manifests/ubuntu.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#
1414

1515
class datadog_agent::ubuntu(
16-
$apt_key = '382E94DE',
16+
$apt_key = 'A2923DFF56EDA6E76E55E492D3A80E30382E94DE',
1717
$agent_version = 'latest',
18-
$other_keys = ['C7A7DA52']
18+
$other_keys = ['935F5A436A5A6E8788F0765B226AE980C7A7DA52']
1919
) {
2020

2121
ensure_packages(['apt-transport-https'])

spec/classes/datadog_agent_ubuntu_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
end
1515

1616
# it should install the mirror
17-
it { should contain_datadog_agent__ubuntu__install_key('C7A7DA52') }
18-
it { should contain_datadog_agent__ubuntu__install_key('382E94DE') }
17+
it { should contain_datadog_agent__ubuntu__install_key('935F5A436A5A6E8788F0765B226AE980C7A7DA52') }
18+
it { should contain_datadog_agent__ubuntu__install_key('A2923DFF56EDA6E76E55E492D3A80E30382E94DE') }
1919
it do
2020
should contain_file('/etc/apt/sources.list.d/datadog.list')\
2121
.that_notifies('Exec[datadog_apt-get_update]')

0 commit comments

Comments
 (0)