Fix handling rootwrap.d filters

First, ironic-lib filters are never copied from the venv.

Second, using `cp` for copying results in rootwrap.d copied inside
of rootwrap.d on upgrade/update.

Change-Id: I1c70c908a2576fd9da82ef89ad7e8e4b1caf4e8f
This commit is contained in:
Dmitry Tantsur 2020-11-11 11:12:59 +01:00
parent ce0236573e
commit 17d4332474
2 changed files with 20 additions and 3 deletions

View File

@ -107,10 +107,21 @@
owner: root
group: root
when: not skip_install | bool
# Note(ashestakov): "copy" module in ansible doesn't support recursive
# copying on remote host. "cp" command used instead.
- name: "Copy rootwrap.d contents from ironic source folder"
command: cp -r "{{ ironic_git_folder }}/etc/ironic/rootwrap.d/" "/etc/ironic/rootwrap.d"
copy:
src: "{{ ironic_git_folder }}/etc/ironic/rootwrap.d/"
dest: "/etc/ironic/rootwrap.d/"
remote_src: yes
owner: root
group: root
when: not skip_install | bool
- name: "Copy rootwrap.d contents from ironic-lib installation"
copy:
src: "{{ bifrost_venv_dir }}/etc/ironic/rootwrap.d/ironic-lib.filters"
dest: "/etc/ironic/rootwrap.d/"
remote_src: yes
owner: root
group: root
when: not skip_install | bool
- name: "Generate admin htpasswd for ironic"

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Copies ironic-lib rootwrap.d filters to the correct location.
- |
Correctly copies rootwrap.d filters on upgrade.