← Back to branch summary

~ubuntu-branches/debian/stretch/fuel-agent/stretch

« back to all changes in this revision

Viewing changes to debian/patches/do-not-restrict-install-to-trusty.patch

  • Committer: Package Import Robot
  • Author(s): Thomas Goirand
  • Date: 2016-03-16 17:12:17 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20160316171217-p5b360dfuxm5yidy
Tags: 9.0~0+2016.03.09.git.b1ba4b7747+dfsg1-1
* New upstream release based on commit b1ba4b7747.
* Uploading to unstable.
* Lots of tweaks to make Debian provisionning works.
* Standards-Version: 3.9.7 (no change).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/do-not-restrict-install-to-trusty.patch
 
1
Description: Do not restrict install to be trusty
 
2
Author: Thomas Goirand <zigo@debian.org>
 
3
Forwarded: no
 
4
Last-Update: 2016-02-25
 
5
 
 
6
--- fuel-agent-7.0+2016.01.29.git.99dc8a2be7+dfsg1.orig/fuel_agent/drivers/nailgun.py
 
7
+++ fuel-agent-7.0+2016.01.29.git.99dc8a2be7+dfsg1/fuel_agent/drivers/nailgun.py
 
8
@@ -747,11 +747,6 @@ class NailgunBuildImage(BaseDataDriver):
 
9
         return None
 
10
 
 
11
     def parse_operating_system(self):
 
12
-        if self.data.get('codename').lower() != 'trusty':
 
13
-            raise errors.WrongInputDataError(
 
14
-                'Currently, only Ubuntu Trusty is supported, given '
 
15
-                'codename is {0}'.format(self.data.get('codename')))
 
16
-
 
17
         packages = self.data.get('packages', self.DEFAULT_TRUSTY_PACKAGES)
 
18
 
 
19
         repos = []
 
20
diff --git a/fuel_agent/tests/test_nailgun_build_image.py b/fuel_agent/tests/test_nailgun_build_image.py
 
21
index 826e6a9..0aca818 100644
 
22
--- a/fuel_agent/tests/test_nailgun_build_image.py
 
23
+++ b/fuel_agent/tests/test_nailgun_build_image.py
 
24
@@ -108,13 +108,6 @@ class TestNailgunBuildImage(unittest2.TestCase):
 
25
         self.assertEqual(NailgunBuildImage.DEFAULT_TRUSTY_PACKAGES,
 
26
                          DEFAULT_TRUSTY_PACKAGES)
 
27
 
 
28
-    @mock.patch.object(NailgunBuildImage, 'parse_schemes')
 
29
-    def test_parse_operating_system_error_bad_codename(self,
 
30
-                                                       mock_parse_schemes):
 
31
-        with self.assertRaises(errors.WrongInputDataError):
 
32
-            data = {'codename': 'not-trusty'}
 
33
-            NailgunBuildImage(data)
 
34
-
 
35
     @mock.patch('fuel_agent.objects.RepoProxies')
 
36
     @mock.patch('fuel_agent.objects.Ubuntu')
 
37
     @mock.patch.object(NailgunBuildImage, 'parse_schemes')