cloud-init/cloud-init-ds-deterministic.patch

55 lines
1.6 KiB
Diff
Raw Normal View History

--- tests/unittests/test_ds_identify.py.orig
+++ tests/unittests/test_ds_identify.py
@@ -1488,7 +1488,6 @@ VALID_CFG = {
},
"IBMCloud-metadata": {
"ds": "IBMCloud",
- "policy_dmi": POLICY_FOUND_ONLY,
"mocks": [
MOCK_VIRT_IS_XEN,
{"name": "is_ibm_provisioning", "ret": shell_false},
@@ -1555,7 +1554,6 @@ VALID_CFG = {
},
"IBMCloud-nodisks": {
"ds": "IBMCloud",
- "policy_dmi": POLICY_FOUND_ONLY,
"mocks": [
MOCK_VIRT_IS_XEN,
{"name": "is_ibm_provisioning", "ret": shell_false},
@@ -1642,7 +1640,6 @@ VALID_CFG = {
},
"VMware-NoValidTransports": {
"ds": "VMware",
- "policy_dmi": POLICY_FOUND_ONLY,
"mocks": [
MOCK_VIRT_IS_VMWARE,
],
@@ -1665,7 +1662,6 @@ VALID_CFG = {
},
"VMware-EnvVar-NoData": {
"ds": "VMware",
- "policy_dmi": POLICY_FOUND_ONLY,
"mocks": [
{
"name": "vmware_has_envvar_vmx_guestinfo",
@@ -1775,7 +1771,6 @@ VALID_CFG = {
},
"VMware-GuestInfo-NoData": {
"ds": "VMware",
- "policy_dmi": POLICY_FOUND_ONLY,
"mocks": [
{
"name": "vmware_has_rpctool",
--- tools/ds-identify.orig
+++ tools/ds-identify
@@ -739,9 +739,6 @@ probe_floppy() {
dscheck_CloudStack() {
is_container && return ${DS_NOT_FOUND}
dmi_product_name_matches "CloudStack*" && return $DS_FOUND
- if [ "$DI_VIRT" = "vmware" ] || [ "$DI_VIRT" = "xen" ]; then
- return $DS_MAYBE
- fi
return $DS_NOT_FOUND
}