Merge lp:~nuclearbob/utah/bug1147306 into lp:utah

[Max Brustkern]

It looks like the templating change broke the ProvisionedMachine class. This change fixed it for me. We should figure out a good way to add ProvisionedMachine to the regular testing as well.

[Andy Doan (doanac)]

Its ugly, but I'm +1 for now. In the future we can hopefully make this more sane by getting the installer logic not bound so tightly to machine.py.

[Javier Collado (javier.collado)]

Note that for provisioned machines only "install-deb-command.jinja2" is used to
install the client package and that the "add_backslash" filter is only used by
"utah-latecommand-in-target.jinja2". Hence, lines 20-25 in the diff can be removed
since they aren't needed.

We could also have a new module that takes care of the template environment to
avoid the duplication of the filter code, but for now I think that probably
that's an overkill unless we find a case in which the filter code duplication
is really needed.

By the way, for all the other machines there shouldn't be any problem since
ProvisionedMachine is the only machine class that doesn't call the
Machine.__init__ method through chained super calls. In the future, it would be
nice to have a class hierarchy in which the initialization method is reused for
all subclasses.

I need to add provisioned machines to the set of basic tests that I run for
each change to make sure things aren't broken like in this case.

[Javier Collado (javier.collado)]

One more thing. When the 0.8 version was released, I started the 0.9 version in
changelog in the dev branch and marked it as unreleased. The plan is to to mark
it as released when the changes are merged to trunk.

Anyway, the point I'm trying to make is that I've been adding a description of
all big changes, in particular bug fixes, that have been merged into dev, so
that it's easier to know what's not included yet in the version from trunk.
Hence, please add such a description to changelog. Thanks.

[lp:~nuclearbob/utah/bug1147306]

828. By Max Brustkern on 2013-03-07

Removed unneeded extra template method

829. By Max Brustkern on 2013-03-07

Fixed ProvisionedMachine template support

[Max Brustkern (nuclearbob)]

I think both of those should be addressed now.

review: Needs Resubmitting

[Javier Collado (javier.collado)]

Sorry for being picky, but for consistency in other changelog (and bzr log)
entries, I think you should use:
<email address hidden>"
DEBFULLNAME="Max Brustkern"

Also please add "LP: #1147306" to the changelog entry.

[lp:~nuclearbob/utah/bug1147306]

830. By Max Brustkern on 2013-03-08

Updated changelog

[Max Brustkern (nuclearbob)]

I'm not sure why those variables didn't get set, I'll have to check my .bashrc. I updated that manually and added the bug number. Thanks for noticing that.

review: Needs Resubmitting

[Javier Collado (javier.collado)]

Changes working for me. Thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-04 14:46:39 +0000
+++ debian/changelog	2013-03-08 13:53:21 +0000
@@ -1,12 +1,16 @@
-utah (0.9ubuntu1) UNRELEASED; urgency=low
+utah (0.9ubuntu2) UNRELEASED; urgency=low
 
+  [ Javier Collado ]
   * Added battery_measurements boolean variable to runlist (defaults to False)
   * Added success command failure detection (LP: #1126115)
   * Added installation failure log message (LP: #1126361)
   * Added check to make sure user is in the password database
     (LP: #1071020)
 
- -- Javier Collado <[e-mail]>  Wed, 27 Feb 2013 09:28:58 +0100
+  [ Max Brustkern ]
+  * Fixed ProvisionedMachine template support (LP: #1147306)
+
+ -- max <[e-mail]>  Thu, 07 Mar 2013 17:11:12 -0500
 
 utah (0.8ubuntu1) quantal; urgency=low
 

=== modified file 'utah/provisioning/ssh.py'
--- utah/provisioning/ssh.py	2013-02-13 15:43:27 +0000
+++ utah/provisioning/ssh.py	2013-03-08 13:53:21 +0000
@@ -26,6 +26,8 @@
 
 from stat import S_ISDIR
 
+from jinja2 import Environment, FileSystemLoader
+
 import utah.timeout
 
 from utah import config
@@ -304,6 +306,9 @@
         if installtype is None:
             self.installtype = config.installtype
 
+        self.template_env = \
+            Environment(loader=FileSystemLoader(config.template_dir))
+
     def activecheck(self):
         """Check if machine is active.