diff --git a/defaults/main.yml b/defaults/main.yml index c91c9e6f..549dc1a5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -178,6 +178,7 @@ openstack_host_ca_certificates: [] openstack_ca_bundle_path: "{{ _openstack_ca_bundle_path }}" # extra configuration for OS package manager +openstack_hosts_package_manager_default_conf: "{{ _openstack_hosts_package_manager_default_conf | default('') }}" openstack_hosts_package_manager_extra_conf: '' # apt pins to apply to all hosts in the deployment diff --git a/tasks/openstack_hosts_configure_apt.yml b/tasks/openstack_hosts_configure_apt.yml index ab26704b..f36d63d0 100644 --- a/tasks/openstack_hosts_configure_apt.yml +++ b/tasks/openstack_hosts_configure_apt.yml @@ -75,10 +75,10 @@ - name: Add apt extra conf copy: - content: "{{ openstack_hosts_package_manager_extra_conf }}" + content: "{{ openstack_hosts_package_manager_default_conf + openstack_hosts_package_manager_extra_conf }}" dest: /etc/apt/apt.conf.d/99openstack-ansible when: - - openstack_hosts_package_manager_extra_conf | length > 0 + - openstack_hosts_package_manager_extra_conf | length > 0 or openstack_hosts_package_manager_default_conf | length > 0 - name: Update Apt cache apt: diff --git a/tasks/openstack_hosts_configure_dnf.yml b/tasks/openstack_hosts_configure_dnf.yml index 18a4dd95..5bd2c52f 100644 --- a/tasks/openstack_hosts_configure_dnf.yml +++ b/tasks/openstack_hosts_configure_dnf.yml @@ -94,12 +94,12 @@ - name: Add dnf extra conf blockinfile: - block: "{{ openstack_hosts_package_manager_extra_conf }}" + block: "{{ openstack_hosts_package_manager_default_conf + openstack_hosts_package_manager_extra_conf }}" path: /etc/dnf/dnf.conf marker: "# {mark} OPENSTACK-ANSIBLE-OPENSTACK_HOSTS MANAGED BLOCK" create: yes when: - - openstack_hosts_package_manager_extra_conf | length > 0 + - openstack_hosts_package_manager_extra_conf | length > 0 or openstack_hosts_package_manager_default_conf | length > 0 - name: Add rdo repositories via url get_url: diff --git a/tasks/openstack_hosts_configure_yum.yml b/tasks/openstack_hosts_configure_yum.yml index 1aa93b3f..ea414dc1 100644 --- a/tasks/openstack_hosts_configure_yum.yml +++ b/tasks/openstack_hosts_configure_yum.yml @@ -92,9 +92,9 @@ - name: Add yum extra conf blockinfile: - block: "{{ openstack_hosts_package_manager_extra_conf }}" + block: "{{ openstack_hosts_package_manager_default_conf + openstack_hosts_package_manager_extra_conf }}" path: /etc/yum.conf marker: "# {mark} OPENSTACK-ANSIBLE-OPENSTACK_HOSTS MANAGED BLOCK" create: yes when: - - openstack_hosts_package_manager_extra_conf | length > 0 + - openstack_hosts_package_manager_extra_conf | length > 0 or openstack_hosts_package_manager_default_conf | length > 0 diff --git a/vars/debian.yml b/vars/debian.yml index b9c6f3a9..e85783ce 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -90,3 +90,6 @@ _package_repos: filename: "osbpo" _openstack_ca_bundle_path: /etc/ssl/certs/ca-certificates.crt + +_openstack_hosts_package_manager_default_conf: | + APT::Install-Recommends "false"; diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml index 1b98a6c0..c83965b0 100644 --- a/vars/ubuntu.yml +++ b/vars/ubuntu.yml @@ -91,3 +91,6 @@ _package_repos: filename: "uca" _openstack_ca_bundle_path: /etc/ssl/certs/ca-certificates.crt + +_openstack_hosts_package_manager_default_conf: | + APT::Install-Recommends "false";