Merge "Move lxc_cache_distro_packages to defaults"
This commit is contained in:
commit
9ad64fb39b
@ -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
|
||||
|
@ -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.
|
@ -81,7 +81,7 @@ lxc_cache_map:
|
||||
fi
|
||||
{{ lxc_cache_prep_post_commands }}
|
||||
|
||||
lxc_cache_distro_packages:
|
||||
_lxc_cache_distro_packages:
|
||||
- ca-certificates
|
||||
- cronie
|
||||
- epel-release
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user