diff options
| author | Brett Holman <brett.holman@canonical.com> | 2023-03-02 10:19:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-02 10:19:37 -0700 |
| commit | d1ffbea556a06105d1ade88b4143ad43f53692c4 (patch) | |
| tree | b36b3502c24d890feec0a236244fcd542cb7c48c /doc/examples/cloud-config-datasources.txt | |
| parent | 635b5a52590922668c13549d087723597a5cce7e (diff) | |
| download | cloud-init-git-d1ffbea556a06105d1ade88b4143ad43f53692c4.tar.gz | |
source: Force OpenStack when it is only option (#2045)
Running on OpenStack Ironic was broken in 1efa8a0a0,
which prevented a system configured to run on only
Openstack from actually running this ds. This change
also prevents the kernel commandline definition from
working. This change was required to prevent
unnecessarily probing OpenStack on Ec2, and is
therefore still required.
This commit reverts an earlier attempt[1][2] to
automatically detect OpenStack, due to regression
it caused. Additionally, this change allows a
system that defines a datasource list containing
only [OpenStack] or [OpenStack, None] to attempt
running on OpenStack, overriding ds_detect(). A
datasource list that defines [OpenStack, None]
still falls back to DataSourceNone if OpenStack
fails to reach the IMDS.
This change also lays groundwork for the following
future work:
1. Add support for other datasources
2. Also override datasource checking when the kernel
command line defines a datasource. This work needs
to be done manually to support non-systemd systems.
Besides forcing OpenStack to run when it is the only
datasource in the datasource list, this commit also:
[1] 0220295 (it breaks some use cases)
[2] 29faf66 (no longer used)
LP: #2008727
Diffstat (limited to 'doc/examples/cloud-config-datasources.txt')
| -rw-r--r-- | doc/examples/cloud-config-datasources.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/doc/examples/cloud-config-datasources.txt b/doc/examples/cloud-config-datasources.txt index 9b5df6b0..43b34418 100644 --- a/doc/examples/cloud-config-datasources.txt +++ b/doc/examples/cloud-config-datasources.txt @@ -16,11 +16,6 @@ datasource: - http://169.254.169.254:80 - http://instance-data:8773 - OpenStack: - # The default list of metadata services to check for OpenStack. - metadata_urls: - - http://169.254.169.254 - MAAS: timeout : 50 max_wait : 120 |