Skip to content

Commit b9e3dc7

Browse files
authored
Merge pull request #33 from tomas321/minor_recommendations
Minor recommendations
2 parents 1139e30 + d30d13c commit b9e3dc7

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

tasks/config_storage_pools.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
---
22

3+
- name: config_storage pools | ensure storage pool paths exist
4+
become: true
5+
file:
6+
path: "{{ item['path'] }}"
7+
state: directory
8+
loop: "{{ kvm_storage_pools }}"
9+
310
- name: config_storage_pools | defining storage pools
411
become: true
512
virt_pool:
@@ -9,7 +16,7 @@
916
register: kvm_pools_defined
1017
loop: "{{ kvm_storage_pools }}"
1118

12-
- name: config_virtual networks | setting state of storage pools
19+
- name: config_storage pools | setting state of storage pools
1320
become: true
1421
virt_pool:
1522
name: "{{ item['name'] }}"

tasks/system_tweaks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
value: "{{ item['value'] }}"
77
state: "{{ item['state'] }}"
88
reload: true
9+
ignoreerrors: true
910
loop: "{{ kvm_sysctl_settings }}"

templates/vm-network.xml.j2

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,22 @@
3535
{% endif %}
3636
{% if item['vlans'] is defined %}
3737
{% for vl in item['vlans'] %}
38-
<portgroup name='{{ vl['name'] }}'>
39-
{% if not vl['trunk'] %}
38+
<portgroup name='{{ vl['name'] }}'{{ vl['default'] | default(false) | ternary(" default='yes'", "") }}>
39+
{% if vl['trunk'] is undefined and vl['default'] | default(false) %}
40+
</portgroup>
41+
{% elif not vl['trunk'] %}
4042
<vlan>
4143
<tag id='{{ vl['vlan'] }}'/>
44+
</vlan>
45+
</portgroup>
4246
{% elif vl['trunk'] %}
4347
<vlan trunk='yes'>
4448
{% for vlt in vl['vlan'] %}
4549
<tag id='{{ vlt }}'/>
4650
{% endfor %}
47-
{% endif %}
4851
</vlan>
49-
</portgroup>
52+
</portgroup>
53+
{% endif %}
5054
{% endfor %}
5155
{% endif %}
5256
{% if item['vlan'] is defined %}

0 commit comments

Comments
 (0)