the other is merged now, so you can rebase and push then the diff will get
updated.
Diff comments:
> diff --git a/tools/ds-identify b/tools/ds-identify
> index e3f93c9..9c69786 100755
> --- a/tools/ds-identify
> +++ b/tools/ds-identify
> @@ -875,23 +875,29 @@ dscheck_GCE() {
> dscheck_OpenStack() {
> # the openstack metadata http service
>
> - # if there is a config drive, then do not check metadata
> + OSDS_FOUND=${DS_FOUND}
this would have to be local
> + # if there is a config drive, then downgrade OpenStack to fallback
> + # datasource DS_MAYBE (if we find signs of existence).
> # FIXME: if config drive not in the search list, then we should not
> # do this check.
> check_configdrive_v2
> if [ $? -eq ${DS_FOUND} ]; then
> - return ${DS_NOT_FOUND}
> + OSDS_FOUND=${DS_MAYBE}
> fi
> local nova="OpenStack Nova" compute="OpenStack Compute"
> if dmi_product_name_matches "$nova"; then
> - return ${DS_FOUND}
> + return ${OSDS_FOUND}
> fi
> if dmi_product_name_matches "$compute"; then
> # RDO installed nova (LP: #1675349).
> - return ${DS_FOUND}
> + return ${OSDS_FOUND}
> fi
> if [ "${DI_PID_1_PRODUCT_NAME}" = "$nova" ]; then
> - return ${DS_FOUND}
> + return ${OSDS_FOUND}
> + fi
> + # OTC gen1 (Xen) hosts use OpenStack datasource, LP: #1756471
> + if dmi_chassis_asset_tag_matches "OpenTelekomCloud"; then
> + return ${OSDS_FOUND}
> fi
>
> # LP: #1715241 : arch other than intel are not identified properly.
--
https://code.launchpad.net/~kgarloff/cloud-init/+git/cloud-init/+merge/341845
Your team cloud-init commiters is requested to review the proposed merge of
~kgarloff/cloud-init:detect_otc_as_openstack_ds 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
