openstack/openstack-ansible
Code Issues Proposed changes

Merge "Change AIO ZFS pool to be at /pool"

Browse Source
This commit is contained in:
Zuul 2018-08-20 23:08:27 +00:00 committed by Gerrit Code Review
commit b0db84228b
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 - data-config
- name: Create the ZFS pool - 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: args:
creates: /osa-test-pool creates: /pool
when: when:
- bootstrap_host_data_disk_device_force | bool - bootstrap_host_data_disk_device_force | bool
- lxc_container_backing_store == 'zfs' - lxc_container_backing_store == 'zfs'
- name: Create the ZFS pool/lxc volume - 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: when:
- bootstrap_host_data_disk_device_force | bool - bootstrap_host_data_disk_device_force | bool
- lxc_container_backing_store == 'zfs' - lxc_container_backing_store == 'zfs'