From 697ddb8fb4022152de60cd2c76c1f0d504d5b2e1 Mon Sep 17 00:00:00 2001
From: Logan V <logan2211@gmail.com>
Date: Tue, 12 Sep 2017 12:21:46 -0500
Subject: [PATCH] Move lxc_cache_distro_packages to defaults

Move the package list from vars/ to defaults/ to allow for overriding
in inventory group/host vars.

Change-Id: Idb186a061a396713a0e449d47ec262b30d5006ca
---
 defaults/main.yml                                             | 3 +++
 .../notes/cache-packages-override-e89847687abddf34.yaml       | 4 ++++
 vars/redhat-7.yml                                             | 2 +-
 vars/suse-42.yml                                              | 2 +-
 vars/ubuntu-16.04.yml                                         | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/cache-packages-override-e89847687abddf34.yaml

diff --git a/defaults/main.yml b/defaults/main.yml
index 49029f3b..84f6e2e2 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -125,6 +125,9 @@ lxc_cache_prep_dns:
 lxc_cache_prep_pre_commands: '## pre command skipped ##'
 lxc_cache_prep_post_commands: '## post command skipped ##'
 
+# List of packages to be installed into the base container cache
+lxc_cache_distro_packages: "{{ _lxc_cache_distro_packages }}"
+
 # Set the servers to download LXC images from
 # NOTE(mhayden): The main images.linuxcontainers.org site will redirect
 # requests to (us|uk).images.linuxcontainers.org upon the first request. We
diff --git a/releasenotes/notes/cache-packages-override-e89847687abddf34.yaml b/releasenotes/notes/cache-packages-override-e89847687abddf34.yaml
new file mode 100644
index 00000000..8f5c9e9c
--- /dev/null
+++ b/releasenotes/notes/cache-packages-override-e89847687abddf34.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - The ``lxc_cache_distro_packages`` has been moved to the role defaults from vars to enable
+    easier overriding of the container cache package list.
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index cdd6c3bb..0a7f6934 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -79,7 +79,7 @@ lxc_cache_map:
     fi
     {{ lxc_cache_prep_post_commands }}
 
-lxc_cache_distro_packages:
+_lxc_cache_distro_packages:
   - ca-certificates
   - cronie
   - epel-release
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index ba58346e..818dc14e 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -84,7 +84,7 @@ lxc_cache_map:
     systemctl -q enable sshd
     {{ lxc_cache_prep_post_commands }}
 
-lxc_cache_distro_packages:
+_lxc_cache_distro_packages:
   - ca-certificates
   - ca-certificates-mozilla
   - git-core
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index f5cf977c..0031f567 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -99,7 +99,7 @@ lxc_cache_map:
 # ref: http://serverfault.com/questions/259226/automatically-keep-current-version-of-config-files-when-apt-get-install
 lxc_cache_install_debconf: '-o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes'
 
-lxc_cache_distro_packages:
+_lxc_cache_distro_packages:
   - apt-transport-https
   - build-essential
   - ca-certificates