From f6f641d96520bc684f15f15242d9a3b56b75d703 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 9 Oct 2017 13:25:02 +1100 Subject: [PATCH] Further docker/deb updates The key in debian-docker-updates should have been updated with the prior change (d6b47faf240f5b6b118d5ebfef2beb17b24866e2) ... but the Release.gpg file is actually signed by the F273FCD8 subkey of 0EBFCD88. So update to that. Also, things have changed such that it's "stable", "edge" and "test". Assume main->stable A manual run with this seems to have mirrored correctly. Change-Id: I6d096957495f03f47b5ab8f25664e83be18ba4f5 --- .../openstack_project/files/reprepro/debian-docker-updates | 6 +++--- modules/openstack_project/manifests/mirror_update.pp | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/files/reprepro/debian-docker-updates b/modules/openstack_project/files/reprepro/debian-docker-updates index 368d09ffa1..f3a04db241 100644 --- a/modules/openstack_project/files/reprepro/debian-docker-updates +++ b/modules/openstack_project/files/reprepro/debian-docker-updates @@ -1,7 +1,7 @@ Name: debian-docker Method: https://download.docker.com/linux/ubuntu/ -Components: main -UDebComponents: main +Components: stable +UDebComponents: stable Architectures: amd64 GetInRelease: no -VerifyRelease: 2C52609D +VerifyRelease: F273FCD8 diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp index ba5a0e7b83..70fd5dbd2a 100644 --- a/modules/openstack_project/manifests/mirror_update.pp +++ b/modules/openstack_project/manifests/mirror_update.pp @@ -282,7 +282,9 @@ class openstack_project::mirror_update ( gnupg_key { 'Docker Archive': ensure => present, - # 9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88 + # pub 4096R/0EBFCD88 2017-02-22 Docker Release (CE deb) + # fingerprint: 9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88 + # Note the key that signs the release file is actually the subkey F273FCD8 key_id => '0EBFCD88', user => 'root', key_type => 'public',