diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-04-28 10:34:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 10:34:10 -0400 |
| commit | f5e1d67bf6faf400749ca192c3394c3356b2654e (patch) | |
| tree | d5055a0405205118d9ee03a96d3cfae04cb5e09d | |
| parent | 429c1ab9b0ee04f5a2287b8579c02907f30e795f (diff) | |
| download | vyos-cloud-init-f5e1d67bf6faf400749ca192c3394c3356b2654e.tar.gz vyos-cloud-init-f5e1d67bf6faf400749ca192c3394c3356b2654e.zip | |
DataSourceNoCloud/OVF: drop claim to support FTP (#333)
I don't believe this has ever been supported, looking at the git
history, but it certainly isn't at the moment.
LP: #1875470
| -rw-r--r-- | cloudinit/sources/DataSourceNoCloud.py | 2 | ||||
| -rw-r--r-- | cloudinit/sources/DataSourceOVF.py | 2 | ||||
| -rw-r--r-- | doc/rtd/topics/datasources/nocloud.rst | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py index 72d86c41..e8856920 100644 --- a/cloudinit/sources/DataSourceNoCloud.py +++ b/cloudinit/sources/DataSourceNoCloud.py @@ -361,7 +361,7 @@ def _merge_new_seed(cur, seeded): class DataSourceNoCloudNet(DataSourceNoCloud): def __init__(self, sys_cfg, distro, paths): DataSourceNoCloud.__init__(self, sys_cfg, distro, paths) - self.supported_seed_starts = ("http://", "https://", "ftp://") + self.supported_seed_starts = ("http://", "https://") # Used to match classes to dependencies diff --git a/cloudinit/sources/DataSourceOVF.py b/cloudinit/sources/DataSourceOVF.py index 7bba283f..41f999e3 100644 --- a/cloudinit/sources/DataSourceOVF.py +++ b/cloudinit/sources/DataSourceOVF.py @@ -337,7 +337,7 @@ class DataSourceOVFNet(DataSourceOVF): def __init__(self, sys_cfg, distro, paths): DataSourceOVF.__init__(self, sys_cfg, distro, paths) self.seed_dir = os.path.join(paths.seed_dir, 'ovf-net') - self.supported_seed_starts = ("http://", "https://", "ftp://") + self.supported_seed_starts = ("http://", "https://") self.vmware_customization_supported = False diff --git a/doc/rtd/topics/datasources/nocloud.rst b/doc/rtd/topics/datasources/nocloud.rst index 7cbd1a81..6d3075f4 100644 --- a/doc/rtd/topics/datasources/nocloud.rst +++ b/doc/rtd/topics/datasources/nocloud.rst @@ -32,7 +32,7 @@ The permitted keys are: With ``ds=nocloud``, the ``seedfrom`` value must start with ``/`` or ``file://``. With ``ds=nocloud-net``, the ``seedfrom`` value must start -with ``http://``, ``https://`` or ``ftp://`` +with ``http://`` or ``https://``. e.g. you can pass this option to QEMU: |