From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Tue, 4 Jan 2022 13:23:00 +0000 (+0100)
Subject: Calling create-motd with all necessary parameters
X-Git-Tag: 1.5.11^2~1
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d6229d562d328f0c853a146e1eefafb13f885506;p=pixelpark%2Fcreate-terraform.git

Calling create-motd with all necessary parameters
---

diff --git a/lib/cr_tf/handler.py b/lib/cr_tf/handler.py
index d7b24a0..fe69ff6 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.6'
+__version__ = '3.6.7'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -2738,10 +2738,13 @@ class CreateTerraformHandler(BaseHandler):
         purpose = self.re_doublequote.sub('\\\"', vm.purpose)
 
         commands.append("chmod +x /tmp/create-motd")
-        commands.append((
-            "/tmp/create-motd --purpose '{p} ({t})' --hardware 'vmware (x86_64)' --owner '{o}' "
-            "--zone 'VMWare' --customer '{c}'  | tee /etc/motd").format(
-                p=purpose, t=vm.puppet_tier, o=vm.customer, c=vm.puppet_customer))
+        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,
+                c=vm.puppet_customer, m=vm.puppet_contact, e=vm.puppet_env)
+        if vm.puppet_project:
+            cmd += " --project '{pr}'".format(pr=vm.puppet_project)
+        commands.append(cmd)
         commands.append("rm -f /tmp/create-motd")
 
         # ## Backup - Legato networker