Ability to add extra package manager configuration
This change implements openstack_hosts_package_manager_extra_conf variable which allows to add extra content into package manager's configuration(works with apt,yum and dnf). Change-Id: Icbd3350c11bd0698bffc2083215ad51af759d5ef
This commit is contained in:
parent
b4a2fb0b1a
commit
853114ea28
|
@ -174,3 +174,6 @@ openstack_host_ca_certificates: []
|
||||||
|
|
||||||
# target directory for user supplied CA certificates
|
# target directory for user supplied CA certificates
|
||||||
openstack_host_ca_location: "{{ _openstack_host_ca_location }}"
|
openstack_host_ca_location: "{{ _openstack_host_ca_location }}"
|
||||||
|
|
||||||
|
# extra configuration for OS package manager
|
||||||
|
openstack_hosts_package_manager_extra_conf: ''
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Implemented ``openstack_hosts_package_manager_extra_conf`` variable.
|
||||||
|
It allows to add extra content into package manager's configuration
|
||||||
|
(works with apt,yum and dnf).
|
|
@ -73,6 +73,13 @@
|
||||||
loop_var: repo
|
loop_var: repo
|
||||||
register: _adding_apt_repo
|
register: _adding_apt_repo
|
||||||
|
|
||||||
|
- name: Add apt extra conf
|
||||||
|
copy:
|
||||||
|
content: "{{ openstack_hosts_package_manager_extra_conf }}"
|
||||||
|
dest: /etc/apt/apt.conf.d/99openstack-ansible
|
||||||
|
when:
|
||||||
|
- openstack_hosts_package_manager_extra_conf | length > 0
|
||||||
|
|
||||||
- name: Update Apt cache
|
- name: Update Apt cache
|
||||||
apt:
|
apt:
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
|
|
|
@ -90,6 +90,15 @@
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 2
|
delay: 2
|
||||||
|
|
||||||
|
- name: Add dnf extra conf
|
||||||
|
blockinfile:
|
||||||
|
block: "{{ 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
|
||||||
|
|
||||||
- name: Add rdo repositories via url
|
- name: Add rdo repositories via url
|
||||||
get_url:
|
get_url:
|
||||||
url: "{{ openstack_hosts_rdo_repo_url }}/delorean.repo"
|
url: "{{ openstack_hosts_rdo_repo_url }}/delorean.repo"
|
||||||
|
|
|
@ -89,3 +89,12 @@
|
||||||
until: _adding_repo is success
|
until: _adding_repo is success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 2
|
delay: 2
|
||||||
|
|
||||||
|
- name: Add yum extra conf
|
||||||
|
blockinfile:
|
||||||
|
block: "{{ 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
|
||||||
|
|
Loading…
Reference in New Issue