Merge ~andreserl/maas:lp1664822_2 into maas:master

[Andres Rodriguez]

LP: #1664822 - Ensure failure to set Lan_Channel doesn't cause complete script failure

[Mike Pontillo (mpontillo)]

Looks good, but missing a unit test for when bmc_set() raises.

review: Needs Fixing

[Mike Pontillo (mpontillo)]

Looks good; thanks for the fix.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1664822_2 lp:~andreserl/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/100/console

[MAAS Lander (maas-lander)]

LANDING
-b lp1664822_2 lp:~andreserl/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/101/console

[MAAS Lander (maas-lander)]

LANDING
-b lp1664822_2 lp:~andreserl/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/102/console

diff --git a/contrib/preseeds_v2/enlist_userdata b/contrib/preseeds_v2/enlist_userdata
index 6085775..408a198 100644
--- a/contrib/preseeds_v2/enlist_userdata
+++ b/contrib/preseeds_v2/enlist_userdata
@@ -50,18 +50,6 @@ misc_bucket:
       chmod "${2:-644}" "${IPMI_CONFIG_D}/$1"
    }
 
-   # Example config: enable BMC remote access (on some systems.)
-   #add_ipmi_config "02-global-config.ipmi" <<"END_IPMI_CONFIG"
-   #Section Lan_Channel
-   #     Volatile_Access_Mode                    Always_Available
-   #     Volatile_Enable_User_Level_Auth         Yes
-   #     Volatile_Channel_Privilege_Limit        Administrator
-   #     Non_Volatile_Access_Mode                Always_Available
-   #     Non_Volatile_Enable_User_Level_Auth     Yes
-   #     Non_Volatile_Channel_Privilege_Limit    Administrator
-   #EndSection
-   #END_IPMI_CONFIG
-
    add_bin "maas-ipmi-autodetect-tool" <<"END_MAAS_IPMI_AUTODETECT_TOOL"
    {{for line in maas_ipmi_autodetect_tool_py.splitlines()}}
    {{line}}
diff --git a/src/metadataserver/user_data/templates/commissioning.template b/src/metadataserver/user_data/templates/commissioning.template
index e29c774..f0d49ab 100644
--- a/src/metadataserver/user_data/templates/commissioning.template
+++ b/src/metadataserver/user_data/templates/commissioning.template
@@ -69,18 +69,6 @@ main() {
 
 ### begin writing files ###
 
-# Example config: enable BMC remote access (on some systems.)
-#add_ipmi_config "02-global-config.ipmi" <<"END_IPMI_CONFIG"
-#Section Lan_Channel
-#	Volatile_Access_Mode			Always_Available
-#	Volatile_Enable_User_Level_Auth		Yes
-#	Volatile_Channel_Privilege_Limit	Administrator
-#	Non_Volatile_Access_Mode		Always_Available
-#	Non_Volatile_Enable_User_Level_Auth	Yes
-#	Non_Volatile_Channel_Privilege_Limit	Administrator
-#EndSection
-#END_IPMI_CONFIG
-
 add_bin "maas-ipmi-autodetect-tool" <<"END_MAAS_IPMI_AUTODETECT_TOOL"
 {{maas_ipmi_autodetect_tool_py}}
 END_MAAS_IPMI_AUTODETECT_TOOL
diff --git a/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py b/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py
index 4fbc849..b5e2125 100644
--- a/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py
+++ b/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py
@@ -242,7 +242,14 @@ def set_ipmi_lan_channel_settings():
         output = bmc_get(mode)
         show_re = re.compile('%s\s+Always_Available' % mode.split(':')[1])
         if show_re.search(output) is None:
-            bmc_set(mode, 'Always_Available')
+            # Some BMC's don't support setting Lan_Channel (see LP: #1287274).
+            # If that happens, it would cause the script to fail preventing
+            # the script from continuing. To address this, simply catch the
+            # error, return and allow the script to continue.
+            try:
+                bmc_set(mode, 'Always_Available')
+            except subprocess.CalledProcessError:
+                return
 
 
 def commit_ipmi_settings(config):
diff --git a/src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py b/src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py
index 2252e90..b7d9411 100644
--- a/src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py
+++ b/src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py
@@ -16,6 +16,7 @@ from maastesting.matchers import (
     MockCalledOnceWith,
     MockCallsMatch,
     MockNotCalled,
+    HasLength,
 )
 from maastesting.testcase import MAASTestCase
 from snippets import maas_ipmi_autodetect
@@ -626,3 +627,23 @@ class TestEnableLanChannel(MAASTestCase):
         self.assertThat(
             bmc_set_mock,
             MockNotCalled())
+
+    def test_set_ipmi_lan_channel_handles_calledprocesserror(self):
+        "Test that set_ipmi_lan_channel handles CalledProcessError"
+        response = (
+            "Section Lan_Channel\n"
+            "    Volatile_Access_Mode    Always_Available\n"
+            "    Non_Volatile_Access_Mode    Always_Available\n"
+            "EndSection"
+        )
+        self.patch(
+            maas_ipmi_autodetect, 'bmc_get').return_value = response
+        bmc_set_mock = self.patch(
+            maas_ipmi_autodetect, 'bmc_set')
+        bmc_set_mock.side_effect = subprocess.CalledProcessError(
+            1, 'bmc-set')
+        set_ipmi_lan_channel_settings()
+        self.assertRaises(
+            subprocess.CalledProcessError, bmc_set_mock)
+        self.assertThat(
+            bmc_set_mock.call_args_list, HasLength(1))