openstack
/
openstack-ansible
Code Issues Proposed changes

Change AIO ZFS pool to be at /pool 

Previously the AIO prepared a ZFS pool at /aio-test-pool but the
lxc_container_create and lxc_hosts role defaults expect the ZFS pool
to be at /pool.

This change aligns the AIO setup with the role defaults, so that the
AIO with a ZFS backing store does not fail.

Change-Id: I9c0f41f7fe1ebdd22accbd67fd0c3a69f93a82bb
This commit is contained in:
Jonathan Rosser 2018-08-13 09:23:36 +01:00
parent a2a962198f
commit b7b18f4054
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/roles/bootstrap-host/tasks/prepare_data_disk.yml
View File

@ -113,15 +113,15 @@
- data-config
- name: Create the ZFS pool
command: zpool create osa-test-pool "/dev/{{ _bootstrap_host_data_disk_device }}2"
command: zpool create pool "/dev/{{ _bootstrap_host_data_disk_device }}2"
args:
creates: /osa-test-pool
creates: /pool
when:
- bootstrap_host_data_disk_device_force | bool
- lxc_container_backing_store == 'zfs'
- name: Create the ZFS pool/lxc volume
shell: "(zfs list | grep lxc) || zfs create -o mountpoint=/var/lib/lxc osa-test-pool/lxc"
shell: "(zfs list | grep lxc) || zfs create -o mountpoint=/var/lib/lxc pool/lxc"
when:
- bootstrap_host_data_disk_device_force | bool
- lxc_container_backing_store == 'zfs'