[DRE-commits] [vagrant-libvirt] 140/163: add veryisolated option for network. close #324

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to annotated tag 0.0.26
in repository vagrant-libvirt.

commit 13fc61b24bf49182c099ae4e85d9cf6b630a2290
Author: dima <pronix.service at gmail.com>
Date:   Thu Apr 9 08:19:31 2015 +0200

    add veryisolated option for network. close #324
---
 README.md                                             |  3 ++-
 lib/vagrant-libvirt/templates/private_network.xml.erb | 16 +++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 1a4f807..6b4ba79 100644
--- a/README.md
+++ b/README.md
@@ -244,11 +244,12 @@ starts with 'libvirt__' string. Here is a list of those options:
 * `:libvirt__dhcp_enabled` - If DHCP will offer addresses, or not. Used only
   when creating new network. Default is true.
 * `:libvirt__adapter` - Number specifiyng sequence number of interface.
-* `:libvirt__forward_mode` - Specify one of `none`, `nat` or `route` options.
+* `:libvirt__forward_mode` - Specify one of `veryisolated`, `none`, `nat` or `route` options.
   This option is used only when creating new network. Mode `none` will create
   isolated network without NATing or routing outside. You will want to use
   NATed forwarding typically to reach networks outside of hypervisor. Routed
   forwarding is typically useful to reach other networks within hypervisor.
+  `veryisolated` described [here](https://libvirt.org/formatnetwork.html#examplesNoGateway).
   By default, option `nat` is used.
 * `:libvirt__forward_device` - Name of interface/device, where network should
   be forwarded (NATed or routed). Used only when creating new network. By
diff --git a/lib/vagrant-libvirt/templates/private_network.xml.erb b/lib/vagrant-libvirt/templates/private_network.xml.erb
index e3c8f9a..e52bbe3 100644
--- a/lib/vagrant-libvirt/templates/private_network.xml.erb
+++ b/lib/vagrant-libvirt/templates/private_network.xml.erb
@@ -2,7 +2,7 @@
   <name><%= @network_name %></name>
   <bridge name="<%= @network_bridge_name %>" />
 
-  <% if (@network_forward_mode != 'none' && @network_forward_mode != 'isolated') %>
+  <% if (@network_forward_mode != 'none' && @network_forward_mode != 'veryisolated') %>
     <% if @network_forward_device %>
       <forward mode="<%= @network_forward_mode %>" dev="<%= @network_forward_device %>" />
     <% else %>
@@ -10,15 +10,13 @@
     <% end %>
   <% end %>
 
-  <% if @network_forward_mode != 'isolated' %>
+  <% if @network_forward_mode != 'veryisolated' %>
     <ip address="<%= @network_address %>" netmask="<%= @network_netmask %>">
-  <% end %>
-  <% if @network_dhcp_enabled  %>
-    <dhcp>
-      <range start="<%= @network_range_start %>" end="<%= @network_range_stop %>" />
-    </dhcp>
-  <% end %>
-  <% if @network_forward_mode != 'isolated' %>
+    <% if @network_dhcp_enabled  %>
+      <dhcp>
+        <range start="<%= @network_range_start %>" end="<%= @network_range_stop %>" />
+      </dhcp>
+    <% end %>
     </ip>
   <% end %>
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git