MAAS

Merge ~andreserl/maas:skip_fruid_controller into maas:master

  1. Git
  2. lp:~andreserl/maas
  3. skip_fruid_controller
  4. Merge into master
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 23d1146ac968777cb1ecc19707af9b8887882f21
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:skip_fruid_controller
Merge into: maas:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/provisioningserver/refresh/node_info_scripts.py (+1/-1)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+331854@code.launchpad.net

Commit message

Do not run get-fruid-api-data commissioning scrip on controllers.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/refresh/node_info_scripts.py b/src/provisioningserver/refresh/node_info_scripts.py
2index 7ba7ca2..ace1ea5 100644
3--- a/src/provisioningserver/refresh/node_info_scripts.py
4+++ b/src/provisioningserver/refresh/node_info_scripts.py
5@@ -650,7 +650,7 @@ NODE_INFO_SCRIPTS = OrderedDict([
6 'hook': null_hook,
7 'packages': GET_FRUID_DATA_PACKAGES,
8 'timeout': timedelta(seconds=10),
9- 'run_on_controller': True,
10+ 'run_on_controller': False,
11 }),
12 ('00-maas-07-block-devices', {
13 'content': make_function_call_script(gather_physical_block_devices),

Subscribers

People subscribed via source and target branches