Merge branch 'liw/simplify-system-kind'

3 files changed, 19 insertions, 2 deletions

diff --git a/morphlib/morph2_tests.py b/morphlib/morph2_tests.py
index 49be9c8c..1a0b4822 100644
--- a/morphlib/morph2_tests.py
+++ b/morphlib/morph2_tests.py
@@ -309,7 +309,7 @@ class MorphologyTests(unittest.TestCase):
     "kind": "system",
     "disk-size": "1g",
     "arch": "x86_64",
-    "system-kind": "syslinux-disk"
+    "system-kind": "rootfs-tarball"
 }'''
 
     def test_writing_preserves_disk_size(self):
diff --git a/morphlib/morphologyfactory.py b/morphlib/morphologyfactory.py
index 76905eb9..817d7fcd 100644
--- a/morphlib/morphologyfactory.py
+++ b/morphlib/morphologyfactory.py
@@ -110,6 +110,17 @@ class MorphologyFactory(object):
             raise morphlib.Error('No system-kind defined in system %s '
                                  '(it is a mandatory field)' % filename)
 
+        if morphology['system-kind'] != 'rootfs-tarball':
+            self._app.status(
+                msg='You are using a system-kind %(kind)s. '
+                    'This is deprecated and untested functionality that will '
+                    'be removed in a future version of Baserock. The only '
+                    'supported system-kind is rootfs-tarball. '
+                    'Please convert your system morphologies to '
+                    'rootfs-tarball and use morph deploy to create '
+                    'disk images.',
+                kind=morphology['system-kind'])
+
         name = morphology['name']
         morphology.builds_artifacts = [name + '-rootfs']
 
diff --git a/morphlib/morphologyfactory_tests.py b/morphlib/morphologyfactory_tests.py
index 6e17df48..dbdb4228 100644
--- a/morphlib/morphologyfactory_tests.py
+++ b/morphlib/morphologyfactory_tests.py
@@ -106,13 +106,19 @@ class FakeLocalRepoCache(object):
         return self.lr
 
 
+class FakeApp(object):
+
+    def status(self, **kwargs):
+        pass
+
+
 class MorphologyFactoryTests(unittest.TestCase):
 
     def setUp(self):
         self.lr = FakeLocalRepo()
         self.lrc = FakeLocalRepoCache(self.lr)
         self.rrc = FakeRemoteRepoCache()
-        self.mf = MorphologyFactory(self.lrc, self.rrc)
+        self.mf = MorphologyFactory(self.lrc, self.rrc, app=FakeApp())
         self.lmf = MorphologyFactory(self.lrc, None)
 
     def nolocalfile(self, *args):