Merge ~smoser/cloud-init:bug/ds-identify-list-none-twice into cloud-init:master
Proposed by
Scott Moser
Status: | Merged |
---|---|
Merged at revision: | 13673f8d2b815452aa22f8e3811e04481558a731 |
Proposed branch: | ~smoser/cloud-init:bug/ds-identify-list-none-twice |
Merge into: | cloud-init:master |
Diff against target: |
38 lines (+12/-4) 2 files modified
tests/unittests/test_ds_identify.py (+7/-0) tools/ds-identify (+5/-4) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chad Smith | Approve | ||
Server Team CI bot | continuous-integration | Approve | |
cloud-init Commiters | Pending | ||
Review via email: mp+324557@code.launchpad.net |
Commit message
fix tools/ds-identify to not write None twice.
If the user configured:
datasource_list: ["Ec2", "None"]
then ds-identify would write
datasource_list: ["Ec2", "None", "None"]
which would break the logic to avoid warning.
Description of the change
this is the ds-identify portion of
https:/
To post a comment you must log in.
PASSED: Continuous integration, rev:13673f8d2b8 15452aa22f8e381 1e04481558a731 /jenkins. ubuntu. com/server/ job/cloud- init-ci/ 392/ /jenkins. ubuntu. com/server/ job/cloud- init-ci/ nodes=metal- amd64/392 /jenkins. ubuntu. com/server/ job/cloud- init-ci/ nodes=metal- arm64/392 /jenkins. ubuntu. com/server/ job/cloud- init-ci/ nodes=metal- ppc64el/ 392 /jenkins. ubuntu. com/server/ job/cloud- init-ci/ nodes=metal- s390x/392 /jenkins. ubuntu. com/server/ job/cloud- init-ci/ nodes=vm- i386/392
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/server/ job/cloud- init-ci/ 392/rebuild
https:/