Merge pull request mrlesmithjr#19 from 2stacks/master

[feature] add option for creating lib-virt network with a single vlan…
maurerr · Sep 8, 2018 · 3879c19 · 3879c19
2 parents 6ed93e3 + 4971425
commit 3879c19
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -250,6 +250,13 @@ kvm_virtual_networks: []
   #   bridge_name: 'vmbr101'
   #   autostart: true
   #   state: active
+  # - name: 'maas'
+  #   mode: 'bridge'
+  #   bridge_name: 'ovsbr0'
+  #   autostart: true
+  #   state: active
+  #   virtualport_type: 'openvswitch'
+  #   vlan: 193
 
 # Define VM(s) to create
 kvm_vms: []

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -214,6 +214,13 @@ kvm_virtual_networks: []
   #   bridge_name: 'vmbr101'
   #   autostart: true
   #   state: active
+  # - name: 'maas'
+  #   mode: 'bridge'
+  #   bridge_name: 'ovsbr0'
+  #   autostart: true
+  #   state: active
+  #   virtualport_type: 'openvswitch'
+  #   vlan: 193
 
 # Define VM(s) to create
 kvm_vms: []

diff --git a/templates/vm-network.xml.j2 b/templates/vm-network.xml.j2
@@ -49,4 +49,9 @@
    </portgroup>
 {%   endfor %}
 {% endif %}
+{% if item['vlan'] is defined %}
+  <vlan>
+    <tag id="{{ item['vlan'] }}" />
+  </vlan>
+{% endif %}
 </network>