From 954c32f8b964a7f52f7f778efab2c02b8f1fe99d Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Thu, 17 Oct 2019 03:36:17 -0700
Subject: [PATCH] get 'apt_*' options of kolla-build.conf working again

We broke 'apt_sources_list' and 'apt_preferences' options quite a while
ago. Turned out that fix is quite simple.

This change adds empty sources.list and apt-preferences files which are
always added into images. If kolla-build.conf will use any of APT
related options then those files will be replaced with provided ones.

Change-Id: I7bbdcbd5c60f654a484a872209e0537e3950346c
Closes-bug: #1706549
(cherry picked from commit bf20b41e7dea702b693fa98ea27822c8a33a5591)
---
 docker/base/Dockerfile.j2   | 2 ++
 docker/base/apt_preferences | 1 +
 docker/base/sources.list    | 1 +
 3 files changed, 4 insertions(+)
 create mode 100644 docker/base/apt_preferences
 create mode 100644 docker/base/sources.list

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 6ed1a3a584..e021b23339 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -297,10 +297,12 @@ COPY sources.list.{{ base_distro }} /etc/apt/sources.list
 {% else %}
 COPY sources.list.{{ base_distro }}.{{ base_arch }} /etc/apt/sources.list
 {% endif %}
+COPY sources.list /etc/apt/sources.list.d/kolla-custom.list
 {% endblock %}
 
 {% block base_ubuntu_package_apt_preferences %}
 COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
+COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 {% endblock %}
 
 {% set base_apt_packages = [
diff --git a/docker/base/apt_preferences b/docker/base/apt_preferences
new file mode 100644
index 0000000000..dc5b993f17
--- /dev/null
+++ b/docker/base/apt_preferences
@@ -0,0 +1 @@
+# used for adding custom options by 'apt_preferences' option of kolla-build.conf
diff --git a/docker/base/sources.list b/docker/base/sources.list
new file mode 100644
index 0000000000..1acbbcb59c
--- /dev/null
+++ b/docker/base/sources.list
@@ -0,0 +1 @@
+# used for adding custom repos by 'apt_sources_list' option of kolla-build.conf