diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2019-04-10 20:21:37 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-04-10 20:21:37 +0000 |
| commit | 6322c2ddf4b68a8e7cc467a07fb20a1d151a2ef3 (patch) | |
| tree | 7d4dbf157acc58df6bc8e4050c80afe5d72655a8 /cloudinit/sources/DataSourceScaleway.py | |
| parent | b76714c355a87416f9f07156b0f025aceaca7296 (diff) | |
| download | vyos-cloud-init-6322c2ddf4b68a8e7cc467a07fb20a1d151a2ef3.tar.gz vyos-cloud-init-6322c2ddf4b68a8e7cc467a07fb20a1d151a2ef3.zip | |
Revert "DataSource: move update_events from a class to an instance..."
Moving update_events from a class attribute to an instance attribute
means that it doesn't exist on DataSource objects that are unpickled,
causing tracebacks on cloud-init upgrade.
As this change is only required for cloud-init installations which don't
utilise ds-identify, we're backing it out to be reintroduced once the
upgrade path bug has been addressed.
This reverts commit f2fd6eac4407e60d0e98826ab03847dda4cde138.
Diffstat (limited to 'cloudinit/sources/DataSourceScaleway.py')
| -rw-r--r-- | cloudinit/sources/DataSourceScaleway.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceScaleway.py b/cloudinit/sources/DataSourceScaleway.py index 54bfc1fe..b573b382 100644 --- a/cloudinit/sources/DataSourceScaleway.py +++ b/cloudinit/sources/DataSourceScaleway.py @@ -171,11 +171,10 @@ def query_data_api(api_type, api_address, retries, timeout): class DataSourceScaleway(sources.DataSource): dsname = "Scaleway" + update_events = {'network': [EventType.BOOT_NEW_INSTANCE, EventType.BOOT]} def __init__(self, sys_cfg, distro, paths): super(DataSourceScaleway, self).__init__(sys_cfg, distro, paths) - self.update_events = { - 'network': {EventType.BOOT_NEW_INSTANCE, EventType.BOOT}} self.ds_cfg = util.mergemanydict([ util.get_cfg_by_path(sys_cfg, ["datasource", "Scaleway"], {}), |