diff options
| author | Rick Harding <rharding@mitechie.com> | 2020-11-04 08:06:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 08:06:54 -0500 |
| commit | a9a3f4a074434bf66ab59ba5538fbf866fb0296f (patch) | |
| tree | c0230052d131d330a89fb96e593c516efd2cac0d /cloudinit/sources/DataSourceOpenStack.py | |
| parent | ce040b58781fa01627927bdfeaa072ef3816d53a (diff) | |
| parent | 8dfd8801ab1329efe066876c037f71a73dcf3de1 (diff) | |
| download | cloud-init-git-dependabot/pip/cryptography-3.2.tar.gz | |
Merge branch 'master' into dependabot/pip/cryptography-3.2dependabot/pip/cryptography-3.2
Diffstat (limited to 'cloudinit/sources/DataSourceOpenStack.py')
| -rw-r--r-- | cloudinit/sources/DataSourceOpenStack.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceOpenStack.py b/cloudinit/sources/DataSourceOpenStack.py index 0ede0a0e..b3406c67 100644 --- a/cloudinit/sources/DataSourceOpenStack.py +++ b/cloudinit/sources/DataSourceOpenStack.py @@ -6,6 +6,7 @@ import time +from cloudinit import dmi from cloudinit import log as logging from cloudinit.net.dhcp import EphemeralDHCPv4, NoDHCPLeaseError from cloudinit import sources @@ -225,10 +226,10 @@ def detect_openstack(accept_oracle=False): """Return True when a potential OpenStack platform is detected.""" if not util.is_x86(): return True # Non-Intel cpus don't properly report dmi product names - product_name = util.read_dmi_data('system-product-name') + product_name = dmi.read_dmi_data('system-product-name') if product_name in VALID_DMI_PRODUCT_NAMES: return True - elif util.read_dmi_data('chassis-asset-tag') in VALID_DMI_ASSET_TAGS: + elif dmi.read_dmi_data('chassis-asset-tag') in VALID_DMI_ASSET_TAGS: return True elif accept_oracle and oracle._is_platform_viable(): return True |