openstack/openstack-ansible
Code Issues Proposed changes

Merge "Adds support for disks on HP Smart Array Controllers"

Browse Source
This commit is contained in:
Jenkins 2016-10-19 23:55:59 +00:00 committed by Gerrit Code Review
commit 6a70eb04e5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,20 +43,20 @@
shell: "{{ item }}" shell: "{{ item }}"
when: data_disk_partitions.rc == 1 or bootstrap_host_data_disk_device_force | bool when: data_disk_partitions.rc == 1 or bootstrap_host_data_disk_device_force | bool
with_items: with_items:
- "parted --script /dev/{{ bootstrap_host_data_disk_device }} mklabel gpt" - "parted --script /dev/{{ bootstrap_host_data_disk_device | regex_replace('!','/') }} mklabel gpt"
- "parted --align optimal --script /dev/{{ bootstrap_host_data_disk_device }} mkpart openstack-data1 ext4 0% 40%" - "parted --align optimal --script /dev/{{ bootstrap_host_data_disk_device | regex_replace('!','/') }} mkpart openstack-data1 ext4 0% 40%"
- "parted --align optimal --script /dev/{{ bootstrap_host_data_disk_device }} mkpart openstack-data2 ext4 40% 100%" - "parted --align optimal --script /dev/{{ bootstrap_host_data_disk_device | regex_replace('!','/') }} mkpart openstack-data2 ext4 40% 100%"
tags: tags:
- create-data-disk-partitions - create-data-disk-partitions
- name: Format the partitions - name: Format the partitions
filesystem: filesystem:
fstype: ext4 fstype: ext4
dev: "{{ item }}" dev: "{{ item }}"
when: data_disk_partitions.rc == 1 or bootstrap_host_data_disk_device_force | bool when: data_disk_partitions.rc == 1 or bootstrap_host_data_disk_device_force | bool
with_items: with_items:
- "/dev/{{ bootstrap_host_data_disk_device }}1" - "/dev/{{ bootstrap_host_data_disk_device | regex_replace('!(.*)$','/\\1p') }}1"
- "/dev/{{ bootstrap_host_data_disk_device }}2" - "/dev/{{ bootstrap_host_data_disk_device | regex_replace('!(.*)$','/\\1p') }}2"
tags: tags:
- format-data-partitions - format-data-partitions
@ -67,7 +67,7 @@
fstype: ext4 fstype: ext4
state: mounted state: mounted
with_items: with_items:
- { mount_point: /openstack, device: "/dev/{{ bootstrap_host_data_disk_device }}1"} - { mount_point: /openstack, device: "/dev/{{ bootstrap_host_data_disk_device | regex_replace('!(.*)$','/\\1p') }}1"}
- { mount_point: /var/lib/lxc, device: "/dev/{{ bootstrap_host_data_disk_device }}2"} - { mount_point: /var/lib/lxc, device: "/dev/{{ bootstrap_host_data_disk_device | regex_replace('!(.*)$','/\\1p') }}2"}
tags: tags:
- mount-data-partitions - mount-data-partitions