From 5bb629505d71216d9d8ddbf5e4838d72f3444de5 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 7 Feb 2016 10:09:05 -0600 Subject: [PATCH] Import gpg keys for mirroring into local keyring We need the gpg signing keys for the upstream repos in root's keyring. Fuel uses golja-gnupg for importing keys - so seems like a good thing for us to use too. Change-Id: I343be9397ba53f494485d1ff0f1e1e4c96c0273f --- modules.env | 1 + modules/openstack_project/files/reprepro/updates | 4 ++-- modules/openstack_project/manifests/mirror_update.pp | 12 +++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules.env b/modules.env index d0822fba5f..0f025c04af 100644 --- a/modules.env +++ b/modules.env @@ -56,6 +56,7 @@ SOURCE_MODULES["https://github.com/biemond/biemond-wildfly"]="v0.4.0" SOURCE_MODULES["https://github.com/duritong/puppet-sysctl"]="v0.0.11" SOURCE_MODULES["https://github.com/jfryman/puppet-selinux"]="v0.2.5" SOURCE_MODULES["https://github.com/maestrodev/puppet-wget"]="v1.6.0" +SOURCE_MODULES["https://github.com/n1tr0g/golja-gnupg"]="1.2.2" SOURCE_MODULES["https://github.com/nanliu/puppet-staging"]="1.0.0" SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-apache"]="b9f630a60811694916ecf8758103d4bca2ac6038" SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-apt"]="2.1.0" diff --git a/modules/openstack_project/files/reprepro/updates b/modules/openstack_project/files/reprepro/updates index d9a6d5118e..da0a06712c 100644 --- a/modules/openstack_project/files/reprepro/updates +++ b/modules/openstack_project/files/reprepro/updates @@ -20,7 +20,7 @@ Components: main non-free contrib UDebComponents: main Architectures: amd64 GetInRelease: no -VerifyRelease: 55BE302B +VerifyRelease: 2B90D010 Name: debian-security Method: http://security.debian.org/ @@ -28,4 +28,4 @@ Components: main non-free contrib UDebComponents: main Architectures: amd64 GetInRelease: no -VerifyRelease: 55BE302B +VerifyRelease: 2B90D010 diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp index 58ad02c490..08d3df1eaa 100644 --- a/modules/openstack_project/manifests/mirror_update.pp +++ b/modules/openstack_project/manifests/mirror_update.pp @@ -86,7 +86,17 @@ class openstack_project::mirror_update ( File['/usr/local/bin/reprepro-mirror-update'], File['/etc/afsadmin.keytab'], File['/etc/reprepro.keytab'], - Class['::openstack_project::reprepro'] + Class['::openstack_project::reprepro'], ] } + + include ::gnupg + + gnupg_key { 'Ubuntu Archive': + ensure => present, + key_id => '40976EAF437D05B5', + user => 'root', + key_server => 'hkp://keyserver.ubuntu.com', + key_type => 'public', + } }