From e62de979cbabd2f2c42c5ce5a615c7fa84cd3cfd Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Fri, 23 Mar 2018 20:37:47 -0500 Subject: [PATCH] Copy the "locale" into base container image The default file "locale" and the systemd "locale.conf" are not always present in a container. While these files are not required, without them we get noise in the journal. > Example: http://paste.openstack.org/show/710781 This change simply includes the locales from the host into the base container image which resolves the issue. Change-Id: I2f3ec049b058aefbd7e05e289d3da0daeb85c74a Signed-off-by: Kevin Carter --- vars/redhat-7.yml | 2 ++ vars/suse-42.yml | 2 ++ vars/ubuntu-16.04.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 3fd07961..3cfc977e 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -20,8 +20,10 @@ _lxc_cache_map: arch: "{{ lxc_architecture_mapping.get( ansible_architecture ) }}" release: 7 copy_from_host: + - /etc/default/locale - /etc/environment - /etc/localtime + - /etc/locale.conf - /etc/protocols - /etc/pki/rpm-gpg/ - /etc/yum/pluginconf.d/fastestmirror.conf diff --git a/vars/suse-42.yml b/vars/suse-42.yml index d46a89dc..ff173794 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -22,8 +22,10 @@ _lxc_cache_map: arch: "{{ lxc_architecture_mapping.get( ansible_architecture ) }}" release: "42.3" copy_from_host: + - /etc/default/locale - /etc/environment - /etc/localtime + - /etc/locale.conf - /etc/protocols - /etc/zypp/repos.d/repo-oss.repo - /etc/zypp/repos.d/repo-update.repo diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index ccbd7237..5aa22fa9 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -23,8 +23,10 @@ _lxc_cache_map: - /etc/apt/sources.list - /etc/apt/apt.conf.d/ - /etc/apt/preferences.d/ + - /etc/default/locale - /etc/environment - /etc/localtime + - /etc/locale.conf - /root/repo.keys - /etc/protocols