From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Tue, 4 Jan 2022 17:35:47 +0000 (+0100)
Subject: Fixing generation of instance file in lib/cr_tf/handler.py
X-Git-Tag: 1.5.12^2~2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a0e55dfb9dd67a9c9cde265060fbfab5957b20a2;p=pixelpark%2Fcreate-terraform.git

Fixing generation of instance file in lib/cr_tf/handler.py
---

diff --git a/lib/cr_tf/handler.py b/lib/cr_tf/handler.py
index fe69ff6..e21c30d 100644
--- a/lib/cr_tf/handler.py
+++ b/lib/cr_tf/handler.py
@@ -67,7 +67,7 @@ from .terraform.disk import TerraformDisk
 
 from .xlate import XLATOR
 
-__version__ = '3.6.7'
+__version__ = '3.6.8'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -2740,10 +2740,11 @@ class CreateTerraformHandler(BaseHandler):
         commands.append("chmod +x /tmp/create-motd")
         cmd = ("/tmp/create-motd --purpose '{p}' --hardware 'vmware (x86_64)' --owner '{o}' "
                 "--zone 'VMWare' --customer '{c}'  --email '{m}' --tier '{t}' "
-                "--environment '{e}'").format( p=purpose, t=vm.puppet_tier, o=vm.customer,
+                "--environment '{e}' --role '{r}'").format( p=purpose, t=vm.puppet_tier, o=vm.customer,
                 c=vm.puppet_customer, m=vm.puppet_contact, e=vm.puppet_env)
         if vm.puppet_project:
             cmd += " --project '{pr}'".format(pr=vm.puppet_project)
+        cmd += " tee /etc/motd"
         commands.append(cmd)
         commands.append("rm -f /tmp/create-motd")