Re: [Cloud-init-dev] [Merge] ~smoser/cloud-init:bug/ds-identify-none-twice into cloud-init:master
Review: Needs Fixing continuous-integration FAILED: Continuous integration, rev:0 https://jenkins.ubuntu.com/server/job/cloud-init-ci/183/ Executed test runs: FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/183/console FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/183/console FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/183/console FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/183/console FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/183/console Click here to trigger a rebuild: https://jenkins.ubuntu.com/server/job/cloud-init-ci/183/rebuild -- https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/321208 Your team cloud init development team is requested to review the proposed merge of ~smoser/cloud-init:bug/ds-identify-none-twice into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~smoser/cloud-init:bug/ds-identify-none-twice into cloud-init:master
Review: Approve -- https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/321208 Your team cloud init development team is requested to review the proposed merge of ~smoser/cloud-init:bug/ds-identify-none-twice into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~smoser/cloud-init:bug/ds-identify-none-twice into cloud-init:master
Review: Approve continuous-integration PASSED: Continuous integration, rev:841f1fc340f3827b74a3348c5e3531c0e7504949 https://jenkins.ubuntu.com/server/job/cloud-init-ci/171/ Executed test runs: SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/171 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/171 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/171 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/171 SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/171 Click here to trigger a rebuild: https://jenkins.ubuntu.com/server/job/cloud-init-ci/171/rebuild -- https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/321208 Your team cloud init development team is requested to review the proposed merge of ~smoser/cloud-init:bug/ds-identify-none-twice into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~smoser/cloud-init:bug/ds-identify-none-twice into cloud-init:master
Scott Moser has proposed merging ~smoser/cloud-init:bug/ds-identify-none-twice
into cloud-init:master.
Commit message:
ds-identify: do not write None twice to datasource_list.
If the only the None datasource was listed in datasource_list, then
ds-identify would write a cloud.cfg witih:
datasource_list: [None, None]
The fix is to just append None if the list only has None.
Requested reviews:
Dan Watkins (daniel-thewatkins)
cloud init development team (cloud-init-dev)
For more details, see:
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/321208
--
Your team cloud init development team is requested to review the proposed merge
of ~smoser/cloud-init:bug/ds-identify-none-twice into cloud-init:master.
diff --git a/tools/ds-identify b/tools/ds-identify
index 3010634..54bd999 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -954,7 +954,9 @@ found() {
shift
fi
# always write the None datasource last.
-list="${list:+${list}, }None"
+if [ "$list" != "None" ]; then
+list="${list:+${list}, }None"
+fi
write_result "datasource_list: [ $list ]" "$@"
return
}
___
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help : https://help.launchpad.net/ListHelp
