Browse Source
Merge pull request #40 from simonpasquier/fix-storage-test
Misc fixes for LVM storagetags/2016.12
Aleš Komárek
8 years ago
2 changed files with 2 additions and 2 deletions
+ 1
- 1
linux/storage/init.sls
View File
| {%- from "linux/map.jinja" import storage with context %} | {%- from "linux/map.jinja" import storage with context %} | ||||
| {%- if storage.mount|length > 0 or storage.swap|length > 0 or storage.multipath.enabled %} | |||||
| {%- if storage.mount|length > 0 or storage.swap|length > 0 or storage.multipath.enabled or storage.lvm|length > 0 %} | |||||
| include: | include: | ||||
| {%- if storage.mount|length > 0 %} | {%- if storage.mount|length > 0 %} | ||||
| - linux.storage.mount | - linux.storage.mount |
+ 1
- 1
linux/storage/lvm.sls
View File
| - name: {{ vg.get('name', vgname) }} | - name: {{ vg.get('name', vgname) }} | ||||
| - devices: {{ vg.devices|join(',') }} | - devices: {{ vg.devices|join(',') }} | ||||
| {%- for lvname, volume in vg.volume.iteritems() %} | |||||
| {%- for lvname, volume in vg.get('volume', {}).iteritems() %} | |||||
| lvm_{{ vg.get('name', vgname) }}_lv_{{ volume.get('name', lvname) }}: | lvm_{{ vg.get('name', vgname) }}_lv_{{ volume.get('name', lvname) }}: | ||||
| lvm.lv_present: | lvm.lv_present: |
Loading…