From ec10ed3d58b27bb69503d22b66852745f4e10f1b Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 11 Jan 2022 14:26:56 +0100 Subject: [PATCH] Changing generation of MOTD --- lib/cr_tf/handler.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/cr_tf/handler.py b/lib/cr_tf/handler.py index 6a5f6ab..5950b8f 100644 --- a/lib/cr_tf/handler.py +++ b/lib/cr_tf/handler.py @@ -2737,11 +2737,14 @@ class CreateTerraformHandler(BaseHandler): purpose = self.re_doublequote.sub('\\\"', vm.purpose) + zone = "{z}/{c}".format(z=vm.vsphere, c=vm.cluster) + 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}' --role '{r}'").format( p=purpose, t=vm.puppet_tier, o=vm.customer, - c=vm.puppet_customer, m=vm.puppet_contact, e=vm.puppet_env, r=vm.puppet_role) + "--location 'VMWare' --zone '{z}' --customer '{c}' --email '{m}' --tier '{t}' " + "--environment '{e}' --role '{r}'").format( p=purpose, t=vm.puppet_tier, + o=vm.customer, z=zone, c=vm.puppet_customer, m=vm.puppet_contact, + e=vm.puppet_env, r=vm.puppet_role) if vm.puppet_project: cmd += " --project '{pr}'".format(pr=vm.puppet_project) cmd += " | tee /etc/motd" -- 2.39.5