from .xlate import XLATOR
-__version__ = '3.6.6'
+__version__ = '3.6.7'
LOG = logging.getLogger(__name__)
_ = XLATOR.gettext
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