From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 16 Dec 2019 17:28:51 +0000 (+0100)
Subject: Fixing generation of conf-resolver options
X-Git-Tag: 1.4.3~1^2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=3eb655a600ee9364d57a367c5eab022c67983eab;p=pixelpark%2Fcreate-terraform.git

Fixing generation of conf-resolver options
---

diff --git a/lib/cr_tf/handler.py b/lib/cr_tf/handler.py
index 45565bf..273efaa 100644
--- a/lib/cr_tf/handler.py
+++ b/lib/cr_tf/handler.py
@@ -60,7 +60,7 @@ from .terraform.disk import TerraformDisk
 
 from .xlate import XLATOR
 
-__version__ = '3.4.1'
+__version__ = '3.4.2'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -2617,10 +2617,8 @@ class CreateTerraformHandler(BaseHandler):
 
         commands.append("chmod +x /tmp/conf-resolver")
         cmd = '/tmp/conf-resolver'
-        if self.verbose:
-            cmd += ' --verbose'
         for ns in vm.nameservers:
-            cmd += ' --ns {!r}'.format(ns)
+            cmd += ' --ns {!r}'.format(str(ns))
         for dom in vm.searchdomains:
             cmd += ' --search {!r}'.format(dom)
         if vm.dns_options: