Merge lp:~rvb/maas/bug-1021382 into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Use absolute path in COMMISSIONING_SCRIPT.

This branch fixes the setting COMMISSIONING_SCRIPT which, in the production settings (src/maas/settings.py), should use an absolute path.

Similar to https://code.launchpad.net/~rvb/maas/maas-1.0-bug-1021382/+merge/113717, with an added import.

[Raphaël Badin (rvb)]

Self-reviewing this as it's similar to https://code.launchpad.net/~rvb/maas/maas-1.0-bug-1021382/+merge/113717.

review: Approve

=== modified file 'src/maas/development.py'
--- src/maas/development.py	2012-06-21 20:49:18 +0000
+++ src/maas/development.py	2012-07-06 10:25:26 +0000
@@ -12,6 +12,7 @@
 __metaclass__ = type
 
 import logging
+import os
 from os.path import abspath
 
 from maas import (
@@ -89,5 +90,14 @@
     abspath("contrib/preseeds_v2"),
     )
 
+# The root directory of the MAAS project for this dev instance.
+DEV_ROOT_DIRECTORY = os.path.join(
+    os.path.dirname(__file__), os.pardir, os.pardir)
+
+
+COMMISSIONING_SCRIPT = os.path.join(
+    DEV_ROOT_DIRECTORY, 'etc/maas/commissioning-user-data')
+
+
 # Allow the user to override settings in maas_local_settings.
 import_local_settings()

=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2012-06-28 12:05:09 +0000
+++ src/maas/settings.py	2012-07-06 10:25:26 +0000
@@ -288,7 +288,7 @@
 # The location of the commissioning script that is executed on nodes as
 # part of commissioning.  Only override this if you know what you are
 # doing.
-COMMISSIONING_SCRIPT = 'etc/maas/commissioning-user-data'
+COMMISSIONING_SCRIPT = '/etc/maas/commissioning-user-data'
 
 # The duration, in minutes, after which we consider a commissioning node
 # to have failed and mark it as FAILED_TESTS.