Remove AIO container cache apt configuration
With the implementation of I420382fd3bbbb5fcae90ae0c6160233202a1a51a the container cache apt configurations are no longer used or necessary. This patch removes them. Change-Id: I73fa1db5210f02d6df9dc324f8b4ec21232d06ba
This commit is contained in:
parent
93596c6784
commit
69f60a80fa
|
@ -20,12 +20,6 @@
|
||||||
tags:
|
tags:
|
||||||
- apt-install-prerequisites
|
- apt-install-prerequisites
|
||||||
|
|
||||||
- name: Determine the list of apt configuration files on the host
|
|
||||||
command: "ls -1 /etc/apt/apt.conf.d"
|
|
||||||
register: apt_conf_files
|
|
||||||
tags:
|
|
||||||
- apt-conf-files
|
|
||||||
|
|
||||||
- name: Determine the existing Ubuntu repo configuration
|
- name: Determine the existing Ubuntu repo configuration
|
||||||
shell: 'awk "/^deb .*ubuntu\/? {{ ansible_distribution_release }} main/ {print \$2; exit}" /etc/apt/sources.list'
|
shell: 'awk "/^deb .*ubuntu\/? {{ ansible_distribution_release }} main/ {print \$2; exit}" /etc/apt/sources.list'
|
||||||
register: ubuntu_repo
|
register: ubuntu_repo
|
||||||
|
|
|
@ -185,14 +185,3 @@
|
||||||
- pip_conf_file.stat.exists
|
- pip_conf_file.stat.exists
|
||||||
tags:
|
tags:
|
||||||
- container-conf-files
|
- container-conf-files
|
||||||
|
|
||||||
- name: Add the list of dicts for the apt config files into user_conf_files
|
|
||||||
lineinfile:
|
|
||||||
dest: /etc/openstack_deploy/user_conf_files.yml
|
|
||||||
line: " - { src: '/etc/apt/apt.conf.d/{{ item }}', dest: '/etc/apt/apt.conf.d/{{ item }}' }"
|
|
||||||
with_items: apt_conf_files.stdout_lines
|
|
||||||
when:
|
|
||||||
- apt_conf_files is defined
|
|
||||||
- apt_conf_files.stdout_lines | length > 0
|
|
||||||
tags:
|
|
||||||
- container-conf-files
|
|
||||||
|
|
|
@ -90,9 +90,6 @@ lxc_net_dhcp_range: 10.255.255.2,10.255.255.253
|
||||||
|
|
||||||
## LXC Container Settings
|
## LXC Container Settings
|
||||||
lxc_cache_resolvers: {{ lxc_cache_resolvers }}
|
lxc_cache_resolvers: {{ lxc_cache_resolvers }}
|
||||||
lxc_container_template_main_apt_repo: {{ bootstrap_host_ubuntu_repo }}
|
|
||||||
lxc_container_template_security_apt_repo: {{ bootstrap_host_ubuntu_security_repo }}
|
|
||||||
lxc_container_template_apt_components: {{ bootstrap_host_apt_components }}
|
|
||||||
|
|
||||||
## Security hardening
|
## Security hardening
|
||||||
apply_security_hardening: true
|
apply_security_hardening: true
|
||||||
|
|
Loading…
Reference in New Issue