From 9fd34ada152889c06c744ea5b4928c3554c9b4c5 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Mon, 24 Jun 2019 14:30:07 +0100
Subject: [PATCH] Fix copying apt keys from host to containers

Without the trailing slash the keys had an extra level of directories
as follows: /etc/apt/trusted.gpg.d/trusted.gpg.d/<keys>

Change-Id: Ibe4112ef947513439643025ddf0fd543b28aba70
---
 vars/ubuntu-16.04.yml | 2 +-
 vars/ubuntu-18.04.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index df791ef8..f84b7a5c 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -22,7 +22,7 @@ _lxc_cache_map:
   copy_from_host:
     - /etc/apt/sources.list
     - /etc/apt/apt.conf.d/
-    - /etc/apt/trusted.gpg.d
+    - /etc/apt/trusted.gpg.d/
     - /etc/apt/preferences.d/
     - /etc/environment
     - /etc/localtime
diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml
index 9d13599c..9084d4a6 100644
--- a/vars/ubuntu-18.04.yml
+++ b/vars/ubuntu-18.04.yml
@@ -22,7 +22,7 @@ _lxc_cache_map:
   copy_from_host:
     - /etc/apt/sources.list
     - /etc/apt/apt.conf.d/
-    - /etc/apt/trusted.gpg.d
+    - /etc/apt/trusted.gpg.d/
     - /etc/apt/preferences.d/
     - /etc/environment
     - /etc/localtime