[lxc-devel] [lxd/master] init: Ask about NAT if needed

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 485 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161003/3f33c197/attachment.bin>
-------------- next part --------------
From fd7561b335d8fcae5262c23626cd1709d9f1b8da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 3 Oct 2016 13:42:29 -0400
Subject: [PATCH] init: Ask about NAT if needed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For auto subnets and for disabled connectivity, we don't need to know if
NAT is needed, but for user provided settings, we do.

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/main.go | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/lxd/main.go b/lxd/main.go
index c3b491a..1f9b170 100644
--- a/lxd/main.go
+++ b/lxd/main.go
@@ -601,7 +601,9 @@ func cmdInit() error {
 	var imagesAutoUpdate bool // controls whether we set images.auto_update_interval to 0
 	var bridgeName string     // Bridge name
 	var bridgeIPv4 string     // IPv4 address
+	var bridgeIPv4Nat bool    // IPv4 address
 	var bridgeIPv6 string     // IPv6 address
+	var bridgeIPv6Nat bool    // IPv6 address
 
 	// Detect userns
 	defaultPrivileged = -1
@@ -894,7 +896,7 @@ they otherwise would.
 			trustPassword = askPassword("Trust password for new clients: ")
 		}
 
-		if !askBool("Would you like stale cached images to be updated automatically? (yes/no) [default=yes]? ", "yes") {
+		if !askBool("Would you like stale cached images to be updated automatically (yes/no) [default=yes]? ", "yes") {
 			imagesAutoUpdate = false
 		}
 
@@ -907,12 +909,20 @@ they otherwise would.
 				return networkValidAddressCIDRV4(value)
 			})
 
+			if !shared.StringInSlice(bridgeIPv4, []string{"auto", "none"}) {
+				bridgeIPv4Nat = askBool("Would you like LXD to NAT IPv4 traffic on your bridge? [default=yes]? ", "yes")
+			}
+
 			bridgeIPv6 = askString("What IPv6 subnet should be used (CIDR notation, “auto” or “none”) [default=auto]? ", "auto", func(value string) error {
 				if shared.StringInSlice(value, []string{"auto", "none"}) {
 					return nil
 				}
 				return networkValidAddressCIDRV6(value)
 			})
+
+			if !shared.StringInSlice(bridgeIPv6, []string{"auto", "none"}) {
+				bridgeIPv6Nat = askBool("Would you like LXD to NAT IPv6 traffic on your bridge? [default=yes]? ", "yes")
+			}
 		}
 	}
 
@@ -1024,6 +1034,14 @@ they otherwise would.
 		bridgeConfig["ipv4.address"] = bridgeIPv4
 		bridgeConfig["ipv6.address"] = bridgeIPv6
 
+		if bridgeIPv4Nat {
+			bridgeConfig["ipv4.nat"] = "true"
+		}
+
+		if bridgeIPv6Nat {
+			bridgeConfig["ipv6.nat"] = "true"
+		}
+
 		err = c.NetworkCreate(bridgeName, bridgeConfig)
 		if err != nil {
 			return err