diff options
| author | zsdc <taras@vyos.io> | 2020-03-11 21:20:58 +0200 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2020-03-11 21:22:23 +0200 |
| commit | c6627bc05a57645e6af8b9a5a67e452d9f37e487 (patch) | |
| tree | b754b3991e5e57a9ae9155819f73fa0cbd4be269 /cloudinit/apport.py | |
| parent | ca9a4eb26b41c204d1bd3a15586b14a5dde950bb (diff) | |
| parent | 13e82554728b1cb524438163784e5b955c7c5ed0 (diff) | |
| download | vyos-cloud-init-c6627bc05a57645e6af8b9a5a67e452d9f37e487.tar.gz vyos-cloud-init-c6627bc05a57645e6af8b9a5a67e452d9f37e487.zip | |
Cloud-init: T2117: Updated to 20.1
- Merge 20.1 version from the Canonical repository
- Removed unneeded changes in datasources (now only OVF datasource is not equal to upstream's version)
- Adapted cc_vyos module to new Cloud-init version
- Changed Jenkinsfile to use build scripts, provided by upstream
Diffstat (limited to 'cloudinit/apport.py')
| -rw-r--r-- | cloudinit/apport.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cloudinit/apport.py b/cloudinit/apport.py index 22cb7fde..1f2c2e7e 100644 --- a/cloudinit/apport.py +++ b/cloudinit/apport.py @@ -22,7 +22,9 @@ KNOWN_CLOUD_NAMES = [ 'CloudSigma', 'CloudStack', 'DigitalOcean', + 'E24Cloud', 'GCE - Google Compute Engine', + 'Exoscale', 'Hetzner Cloud', 'IBM - (aka SoftLayer or BlueMix)', 'LXD', @@ -32,11 +34,14 @@ KNOWN_CLOUD_NAMES = [ 'OpenStack', 'Oracle', 'OVF', + 'RbxCloud - (HyperOne, Rootbox, Rubikon)', 'OpenTelekomCloud', 'Scaleway', 'SmartOS', 'VMware', - 'Other'] + 'ZStack', + 'Other' +] # Potentially clear text collected logs CLOUDINIT_LOG = '/var/log/cloud-init.log' |