openstack/openstack-ansible
Code Issues Proposed changes

Correct data disk format when using nspawn

Browse Source 
With the change back to using a directory backed container by default,
the path /var/lib/machines is no longer assumed to be running BTRFS.
This change checks the `container_tech` option and if it's nspawn sets
the backend store to BTRFS, otherwise the normal
`lxc_container_backing_store` option will be used to determine the data
disk format.

Change-Id: I8ad207d4d2b09f15cdf95b5c6c7fc8fa22449f8c
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2018-06-27 14:22:36 -05:00
parent a64d1124bc
commit a39e53b110
No known key found for this signature in database
GPG Key ID: 9443251A787B9FB3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/roles/bootstrap-host/defaults/main.yml
View File

@ -258,8 +258,8 @@ bootstrap_host_data_mount_options:
lvm: "defaults"
swap: "%%"
bootstrap_host_data_disk2_fs: "{{ bootstrap_host_data_disk2_formats[lxc_container_backing_store] }}"
bootstrap_host_data_disk2_fs_mount_options: "{{ bootstrap_host_data_mount_options[lxc_container_backing_store] }}"
bootstrap_host_data_disk2_fs: "{{ bootstrap_host_data_disk2_formats[((container_tech == 'nspawn') | ternary('btrfs', lxc_container_backing_store))] }}"
bootstrap_host_data_disk2_fs_mount_options: "{{ bootstrap_host_data_mount_options[((container_tech == 'nspawn') | ternary('btrfs', lxc_container_backing_store))] }}"
bootstrap_host_data_disk2_path: "{{ (lxc_container_backing_store == 'machinectl' or container_tech == 'nspawn') | ternary('/var/lib/machines', '/var/lib/lxc') }}"
# Boolean option to build Amphora image and certs