Merge ~chad.smith/cloud-init:bug/1784685-oracle-detect-openstack-local into cloud-init:master
Status: | Merged |
---|---|
Approved by: | Scott Moser |
Approved revision: | 150cbf8d2a687c3689ccfb2aac95f461b949ef54 |
Merge reported by: | Server Team CI bot |
Merged at revision: | not available |
Proposed branch: | ~chad.smith/cloud-init:bug/1784685-oracle-detect-openstack-local |
Merge into: | cloud-init:master |
Diff against target: |
43 lines (+20/-1) 2 files modified
cloudinit/sources/DataSourceOpenStack.py (+2/-1) tests/unittests/test_datasource/test_openstack.py (+18/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Server Team CI bot | continuous-integration | Approve | |
Scott Moser | Approve | ||
Review via email: mp+351920@code.launchpad.net |
Commit message
oracle: fix detect_openstack to report True on OracleCloud.com DMI data
The OpenStack datasource in 18.3 changed to detect data in the
init-local stage instead of init-network and attempted to redetect
OpenStackLocal datasource on Oracle across reboots. The function
detect_openstack was added to quickly detect whether a platform is
OpenStack based on dmi product_name or chassis_asset_tag and it was
a bit too strict for Oracle in checking for 'OpenStack Nova'/'Compute'
DMI product_name.
Oracle's DMI product_name reports 'SAtandard PC (i440FX + PIIX, 1996)'
and DMI chassis_asset_tag is 'OracleCloud.com'.
detect_openstack function now adds 'OracleCloud.com' as a supported value
'OracleCloud.com' to valid chassis-asset-tags for the OpenStack
datasource.
LP: #1784685
PASSED: Continuous integration, rev:150cbf8d2a6 87c3689ccfb2aac 95f461b949ef54 /jenkins. ubuntu. com/server/ job/cloud- init-ci/ 177/
https:/
Executed test runs:
SUCCESS: Checkout
SUCCESS: Unit & Style Tests
SUCCESS: Ubuntu LTS: Build
SUCCESS: Ubuntu LTS: Integration
SUCCESS: MAAS Compatability Testing
IN_PROGRESS: Declarative: Post Actions
Click here to trigger a rebuild: /jenkins. ubuntu. com/server/ job/cloud- init-ci/ 177/rebuild
https:/