Merge lp:~ltrager/maas/lp1655721_2.1 into lp:maas/2.1

[Lee Trager]

Backport r5643 from trunk: Only reload TGT config when a TGT config file exists.

[Lee Trager (ltrager)]

Approved in https://code.launchpad.net/~ltrager/maas/lp1655721/+merge/314574

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2017-01-19 17:51:07 +0000
+++ docs/changelog.rst	2017-01-19 23:48:57 +0000
@@ -16,6 +16,8 @@
 
 LP: #1656425    Ephemeral environments using the wrong kernel
 
+LP: #1655721    MAAS shouldn't update TGT config when there are no boot sources
+
 2.1.3
 =====
 

=== modified file 'src/provisioningserver/import_images/boot_resources.py'
--- src/provisioningserver/import_images/boot_resources.py	2016-10-26 07:31:57 +0000
+++ src/provisioningserver/import_images/boot_resources.py	2017-01-19 23:48:57 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __all__ = [
@@ -199,6 +199,12 @@
 
     # Update the tgt config.
     targets_conf = os.path.join(snapshot, 'maas.tgt')
+
+    # The targets_conf may not exist in the event the BootSource is broken
+    # and images havn't been imported yet. This fixes LP:1655721
+    if not os.path.exists(targets_conf):
+        return
+
     call_and_check([
         'sudo',
         '/usr/sbin/tgt-admin',

=== modified file 'src/provisioningserver/import_images/tests/test_boot_resources.py'
--- src/provisioningserver/import_images/tests/test_boot_resources.py	2016-11-02 08:27:51 +0000
+++ src/provisioningserver/import_images/tests/test_boot_resources.py	2017-01-19 23:48:57 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for the boot_resources module."""
@@ -25,12 +25,14 @@
 )
 
 from maastesting.factory import factory
+from maastesting.fixtures import TempDirectory
 from maastesting.matchers import (
     MockAnyCall,
     MockCalledOnce,
     MockCalledOnceWith,
     MockCalledWith,
     MockCallsMatch,
+    MockNotCalled,
 )
 from maastesting.testcase import (
     MAASTestCase,
@@ -596,6 +598,22 @@
         boot_resources.update_targets_conf(factory.make_name("snapshot"))
         self.assertThat(mock_ensureService, MockCalledOnceWith("tgt"))
 
+    def test_update_targets_only_runs_when_conf_exists(self):
+        # Regression test for LP:1655721
+        temp_dir = self.useFixture(TempDirectory()).path
+        self.useFixture(ClusterConfigurationFixture(tftp_root=temp_dir))
+        mock_ensureService = self.patch(
+            boot_resources.service_monitor, "ensureService")
+        mock_call_and_check = self.patch(boot_resources, "call_and_check")
+        mock_path_exists = self.patch(boot_resources.os.path, 'exists')
+        mock_path_exists.return_value = False
+        boot_resources.update_targets_conf(temp_dir)
+        self.assertThat(mock_ensureService, MockCalledOnceWith("tgt"))
+        self.assertThat(
+            mock_path_exists,
+            MockCalledOnceWith(os.path.join(temp_dir, 'maas.tgt')))
+        self.assertThat(mock_call_and_check, MockNotCalled())
+
 
 class TestMetaContains(MAASTestCase):
     """Tests for the `meta_contains` function."""