← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jtv/maas/doris-I-love-you-but into lp:maas

 

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/doris-I-love-you-but into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/doris-I-love-you-but/+merge/97374

Grrr lint yak shave shave shave
-- 
https://code.launchpad.net/~jtv/maas/doris-I-love-you-but/+merge/97374
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/doris-I-love-you-but into lp:maas.
=== modified file 'src/provisioningserver/api.py'
--- src/provisioningserver/api.py	2012-03-14 00:55:03 +0000
+++ src/provisioningserver/api.py	2012-03-14 11:31:20 +0000
@@ -194,9 +194,10 @@
         assert isinstance(profile, basestring)
         assert power_type in (POWER_TYPE.VIRSH, POWER_TYPE.WAKE_ON_LAN)
         assert isinstance(metadata, dict)
+        preseed = b64encode(metadata_preseed % metadata)
         attributes = {
             "profile": profile,
-            "ks_meta": {"MAAS_PRESEED": b64encode(metadata_preseed % metadata)},
+            "ks_meta": {"MAAS_PRESEED": preseed},
             "power_type": power_type,
             }
         system = yield CobblerSystem.new(self.session, name, attributes)