From 0332443c070eb6fa70cc0c5f7896d6462ff9e813 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 3 May 2017 10:42:25 -0400 Subject: [PATCH] Fixes needed for reprepro docker mirror Change-Id: I4aab462ed62fe2d60b0572efd06804f063015ab8 Signed-off-by: Paul Belanger --- modules/openstack_project/files/reprepro/debian-docker-updates | 2 +- modules/openstack_project/manifests/mirror_update.pp | 2 +- .../templates/reprepro/distributions.debian-docker.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openstack_project/files/reprepro/debian-docker-updates b/modules/openstack_project/files/reprepro/debian-docker-updates index 0b0db55d91..2879351a74 100644 --- a/modules/openstack_project/files/reprepro/debian-docker-updates +++ b/modules/openstack_project/files/reprepro/debian-docker-updates @@ -4,4 +4,4 @@ Components: main UDebComponents: main Architectures: amd64 GetInRelease: no -VerifyRelease: 0EBFCD88 +VerifyRelease: 2C52609D diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp index 6e4f918c5a..0bbc103a60 100644 --- a/modules/openstack_project/manifests/mirror_update.pp +++ b/modules/openstack_project/manifests/mirror_update.pp @@ -264,7 +264,7 @@ class openstack_project::mirror_update ( basedir => '/afs/.openstack.org/mirror/deb-docker', distributions => 'openstack_project/reprepro/distributions.debian-docker.erb', updates_file => 'puppet:///modules/openstack_project/reprepro/debian-docker-updates', - releases => ['xenial'], + releases => ['ubuntu-xenial'], } cron { 'reprepro debian docker': diff --git a/modules/openstack_project/templates/reprepro/distributions.debian-docker.erb b/modules/openstack_project/templates/reprepro/distributions.debian-docker.erb index aa09f1810a..e87e98f11c 100644 --- a/modules/openstack_project/templates/reprepro/distributions.debian-docker.erb +++ b/modules/openstack_project/templates/reprepro/distributions.debian-docker.erb @@ -4,7 +4,7 @@ Codename: <%= release %> Description: Docker <%= release.capitalize %> mirror Architectures: amd64 source Components: main -UDebComponents: main +UDebComponents: Contents: .gz Update: debian-docker Log: <%= @logdir %>/debian-docker-<%= release %>.log