openstack/openstack-ansible
Code Issues Proposed changes

Merge "Allow bind mount of types other than directory"

Browse Source
This commit is contained in:
Zuul 2023-08-18 15:25:15 +00:00 committed by Gerrit Code Review
commit 1cf102dca5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/common-tasks/os-lxc-container-setup.yml
View File

@ -42,6 +42,8 @@
with_items: with_items:
- "{{ lxc_default_bind_mounts | default([]) }}" - "{{ lxc_default_bind_mounts | default([]) }}"
- "{{ list_of_bind_mounts | default([]) }}" - "{{ list_of_bind_mounts | default([]) }}"
when:
- item.create | default('dir') == 'dir'
delegate_to: "{{ physical_host }}" delegate_to: "{{ physical_host }}"
tags: tags:
- common-lxc - common-lxc
@ -49,7 +51,7 @@
- name: Add bind mount configuration to container - name: Add bind mount configuration to container
lineinfile: lineinfile:
dest: "/var/lib/lxc/{{ inventory_hostname }}/config" dest: "/var/lib/lxc/{{ inventory_hostname }}/config"
line: "lxc.mount.entry = {{ item['mount_path'] }} {{ item['bind_dir_path'].lstrip('/') }} none bind,create=dir 0 0" line: "lxc.mount.entry = {{ item['mount_path'] }} {{ item['bind_dir_path'].lstrip('/') }} none bind,create={{ item.create | default('dir') }} 0 0"
insertbefore: "^lxc.mount.entry = .*\\s{{ item['bind_dir_path'].lstrip('/') | regex_replace('/', '\/') }}.*" insertbefore: "^lxc.mount.entry = .*\\s{{ item['bind_dir_path'].lstrip('/') | regex_replace('/', '\/') }}.*"
backup: "true" backup: "true"
with_items: with_items: