Further docker/deb updates

The key in debian-docker-updates should have been updated with the
prior change (d6b47faf24) ... 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
This commit is contained in:
Ian Wienand 2017-10-09 13:25:02 +11:00
parent d6b47faf24
commit f6f641d965
2 changed files with 6 additions and 4 deletions

View File

@ -1,7 +1,7 @@
Name: debian-docker Name: debian-docker
Method: https://download.docker.com/linux/ubuntu/ Method: https://download.docker.com/linux/ubuntu/
Components: main Components: stable
UDebComponents: main UDebComponents: stable
Architectures: amd64 Architectures: amd64
GetInRelease: no GetInRelease: no
VerifyRelease: 2C52609D VerifyRelease: F273FCD8

View File

@ -282,7 +282,9 @@ class openstack_project::mirror_update (
gnupg_key { 'Docker Archive': gnupg_key { 'Docker Archive':
ensure => present, ensure => present,
# 9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88 # pub 4096R/0EBFCD88 2017-02-22 Docker Release (CE deb) <docker@docker.com>
# 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', key_id => '0EBFCD88',
user => 'root', user => 'root',
key_type => 'public', key_type => 'public',