MAAS

Merge ~andreserl/maas:lp1827238_neplan_master into maas:master

  1. Git
  2. lp:~andreserl/maas
  3. lp1827238_neplan_master
  4. Merge into master
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 2e17a0d596ec4d46f96a7c359bc7e9b34f619c2e
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:lp1827238_neplan_master
Merge into: maas:master
Diff against target: 48 lines (+9/-5)
2 files modified
src/maasserver/tests/test_preseed_network.py (+4/-2)
src/provisioningserver/utils/netplan.py (+5/-3)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Jason Hobbs (community) Approve
Review via email: mp+366930@code.launchpad.net

Commit message

LP: #1827238 - Workaround cloud-init issue where it misspells gratuitous-arp with gratuitious-arp

To post a comment you must log in.
Revision history for this message
Jason Hobbs (jason-hobbs) wrote :

LGTM

review: Approve
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/tests/test_preseed_network.py b/src/maasserver/tests/test_preseed_network.py
2index b916ad6..c45b04b 100644
3--- a/src/maasserver/tests/test_preseed_network.py
4+++ b/src/maasserver/tests/test_preseed_network.py
5@@ -628,7 +628,8 @@ class TestNetplan(MAASServerTestCase):
6 'parameters': {
7 "mode": "active-backup",
8 "transmit-hash-policy": "layer2",
9- "gratuitous-arp": 3,
10+ # XXX Workaround LP: #1827238
11+ "gratuitious-arp": 3,
12 },
13 'macaddress': '03:01:02:03:04:05'
14 },
15@@ -723,7 +724,8 @@ class TestNetplan(MAASServerTestCase):
16 'parameters': {
17 "mode": "active-backup",
18 "transmit-hash-policy": "layer2",
19- "gratuitous-arp": 3
20+ # XXX Workaround LP: #1827238
21+ "gratuitious-arp": 3
22 },
23 },
24 }),
25diff --git a/src/provisioningserver/utils/netplan.py b/src/provisioningserver/utils/netplan.py
26index ab88ae5..240ab2c 100644
27--- a/src/provisioningserver/utils/netplan.py
28+++ b/src/provisioningserver/utils/netplan.py
29@@ -37,7 +37,11 @@ ifenslave_to_netplan_bond_params = {
30 "bond-lacp-rate": "lacp-rate",
31 "bond-miimon": "mii-monitor-interval",
32 "bond-mode": "mode",
33- "bond-num-grat-arp": "gratuitous-arp",
34+ # XXX Introduce a mispelling to workaround LP: #1827238
35+ "bond-num-grat-arp": "gratuitious-arp",
36+ # This is just an internal alias for bond-num-grat-arp.
37+ "bond-num-unsol-na": "gratuitious-arp",
38+ #
39 "bond-primary-reselect": "primary-reselect-policy",
40 "bond-updelay": "up-delay",
41 "bond-xmit-hash-policy": "transmit-hash-policy",
42@@ -59,8 +63,6 @@ ifenslave_to_netplan_bond_params = {
43 "bond-queue-id": None,
44 "bond-slaves": None,
45 "bond-use-carrier": None,
46- # This is just an internal alias for bond-num-grat-arp.
47- "bond-num-unsol-na": "gratuitous-arp",
48 }
49
50

Subscribers

People subscribed via source and target branches