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
This commit is contained in:
parent
fd5bff9cf1
commit
bf20b41e7d
|
@ -315,10 +315,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 = [
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
# used for adding custom options by 'apt_preferences' option of kolla-build.conf
|
|
@ -0,0 +1 @@
|
|||
# used for adding custom repos by 'apt_sources_list' option of kolla-build.conf
|
Loading…
Reference in New Issue