]> Frank Brehm's Git Trees - pixelpark/create-terraform.git/commitdiff
Fixing generation of conf-resolver options
authorFrank Brehm <frank.brehm@pixelpark.com>
Mon, 16 Dec 2019 17:28:51 +0000 (18:28 +0100)
committerFrank Brehm <frank.brehm@pixelpark.com>
Mon, 16 Dec 2019 17:28:51 +0000 (18:28 +0100)
lib/cr_tf/handler.py

index 45565bfa0d06d3b6832979848a4d2a2e57e9f088..273efaa26700e22b06526b46066ae1dee239fcea 100644 (file)
@@ -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: