diff options
| author | Ryan Harper <ryan.harper@canonical.com> | 2017-10-03 18:56:52 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-10-05 12:39:24 -0400 |
| commit | 57e2e01c703cdd1818d4f4ab8a67f37037d78582 (patch) | |
| tree | 08a6404a8effbb84c6a16b18f249442aeadde743 /cloudinit/net/eni.py | |
| parent | aa024e331f8196855fa8d707a2dd7e26e1deab40 (diff) | |
| download | vyos-cloud-init-57e2e01c703cdd1818d4f4ab8a67f37037d78582.tar.gz vyos-cloud-init-57e2e01c703cdd1818d4f4ab8a67f37037d78582.zip | |
network: bridge_stp value not always correct
Update network_state to store the bridge_stp value as a boolean.
The various renderers then can map the boolean value to the correct
output as needed; eni uses 'on/off', sysconfig uses 'yes/no' and
netplan will use the boolean directly.
Update unittest values for sysconfig and netplan. Both contained the
network_state string value which resulted in not correctly enable/disable
STP in the target system.
Update network_state comment (fd -> forward-delay, add stp as boolean) on
bridge commands to match the expected format of a netplan bridge command.
LP: #1721157
Diffstat (limited to 'cloudinit/net/eni.py')
| -rw-r--r-- | cloudinit/net/eni.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py index bb80ec02..c6a71d16 100644 --- a/cloudinit/net/eni.py +++ b/cloudinit/net/eni.py @@ -95,6 +95,9 @@ def _iface_add_attrs(iface, index): ignore_map.append('mac_address') for key, value in iface.items(): + # convert bool to string for eni + if type(value) == bool: + value = 'on' if iface[key] else 'off' if not value or key in ignore_map: continue if key in multiline_keys: |