diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2019-03-12 14:52:53 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-03-12 14:52:53 +0000 |
| commit | 1e6a72b679838d87c425edd21013260e9f17b500 (patch) | |
| tree | 92950435398177859b5372b016a2c1e8fa4b3e62 | |
| parent | 3554ffe8657738795ae5e1b89f22b39358d78821 (diff) | |
| download | vyos-cloud-init-1e6a72b679838d87c425edd21013260e9f17b500.tar.gz vyos-cloud-init-1e6a72b679838d87c425edd21013260e9f17b500.zip | |
DataSourceEc2: update RELEASE_BLOCKER to be more accurate
Our previous understanding of the upgrade issue was incomplete; it turns
out the only change we need is the one now outlined.
| -rw-r--r-- | cloudinit/sources/DataSourceEc2.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py index 4f2f6ccb..ac28f1db 100644 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py @@ -334,8 +334,12 @@ class DataSourceEc2(sources.DataSource): if isinstance(net_md, dict): result = convert_ec2_metadata_network_config( net_md, macs_to_nics=macs_to_nics, fallback_nic=iface) - # RELEASE_BLOCKER: Xenial debian/postinst needs to add - # EventType.BOOT on upgrade path for classic. + + # RELEASE_BLOCKER: xenial should drop the below if statement, + # because the issue being addressed doesn't exist pre-netplan. + # (This datasource doesn't implement check_instance_id() so the + # datasource object is recreated every boot; this means we don't + # need to modify update_events on cloud-init upgrade.) # Non-VPC (aka Classic) Ec2 instances need to rewrite the # network config file every boot due to MAC address change. |