forked from pool/cloud-init
Robert Schweikert
5fb133e521
+ Remove, included upstream
- fix-default-systemd-unit-dir.patch
- cloud-init-sysconf-ethsetup.patch
- cloud-init-handle-def-route-set.patch
- cloud-init-no-empty-resolv.patch
- cloud-init-proper-ipv6-varname.patch
+ Forward port
- cloud-init-trigger-udev.patch
+ Add cloud-init-detect-nova.diff (bsc#1136440)
+ Modify cloud-init-python2-sigpipe.patch, import signal and constants
+ Update spec to account for new location of bash completion
+ freebsd: add chpasswd pkg in the image [Gonéri Le Bouder]
+ tests: add Eoan release [Paride Legovini]
+ cc_mounts: check if mount -a on no-change fstab path
[Jason Zions (MSFT)] (LP: #1825596)
+ replace remaining occurrences of LOG.warn [Daniel Watkins]
+ DataSourceAzure: Adjust timeout for polling IMDS [Anh Vo]
+ Azure: Changes to the Hyper-V KVP Reporter [Anh Vo]
+ git tests: no longer show warning about safe yaml.
+ tools/read-version: handle errors [Chad Miller]
+ net/sysconfig: only indicate available on known sysconfig distros
(LP: #1819994)
+ packages: update rpm specs for new bash completion path
[Daniel Watkins] (LP: #1825444)
+ test_azure: mock util.SeLinuxGuard where needed
[Jason Zions (MSFT)] (LP: #1825253)
+ setup.py: install bash completion script in new location [Daniel Watkins]
+ mount_cb: do not pass sync and rw options to mount
[Gonéri Le Bouder] (LP: #1645824)
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=138
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py
|
|
index 8c18aa1..7575223 100644
|
|
--- a/tests/unittests/test_ds_identify.py
|
|
+++ b/tests/unittests/test_ds_identify.py
|
|
@@ -435,6 +435,14 @@ class TestDsIdentify(DsIdentifyBase):
|
|
"""Open Telecom identification."""
|
|
self._test_ds_found('OpenStack-OpenTelekom')
|
|
|
|
+ def test_openstack_asset_tag_nova(self):
|
|
+ """OpenStack identification via asset tag OpenStack Nova."""
|
|
+ self._test_ds_found('OpenStack-AssetTag-Nova')
|
|
+
|
|
+ def test_openstack_asset_tag_copute(self):
|
|
+ """OpenStack identification via asset tag OpenStack Compute."""
|
|
+ self._test_ds_found('OpenStack-AssetTag-Compute')
|
|
+
|
|
def test_openstack_on_non_intel_is_maybe(self):
|
|
"""On non-Intel, openstack without dmi info is maybe.
|
|
|
|
@@ -759,6 +767,18 @@ VALID_CFG = {
|
|
'files': {P_CHASSIS_ASSET_TAG: 'OpenTelekomCloud\n'},
|
|
'mocks': [MOCK_VIRT_IS_XEN],
|
|
},
|
|
+ 'OpenStack-AssetTag-Nova': {
|
|
+ # VMware vSphere can't modify product-name, LP: #1669875
|
|
+ 'ds': 'OpenStack',
|
|
+ 'files': {P_CHASSIS_ASSET_TAG: 'OpenStack Nova\n'},
|
|
+ 'mocks': [MOCK_VIRT_IS_XEN],
|
|
+ },
|
|
+ 'OpenStack-AssetTag-Compute': {
|
|
+ # VMware vSphere can't modify product-name, LP: #1669875
|
|
+ 'ds': 'OpenStack',
|
|
+ 'files': {P_CHASSIS_ASSET_TAG: 'OpenStack Compute\n'},
|
|
+ 'mocks': [MOCK_VIRT_IS_XEN],
|
|
+ },
|
|
'OVF-seed': {
|
|
'ds': 'OVF',
|
|
'files': {
|
|
diff --git a/tools/ds-identify b/tools/ds-identify
|
|
index 6518901..e16708f 100755
|
|
--- a/tools/ds-identify
|
|
+++ b/tools/ds-identify
|
|
@@ -979,6 +979,14 @@ dscheck_OpenStack() {
|
|
return ${DS_FOUND}
|
|
fi
|
|
|
|
+ # LP: #1669875 : allow identification of OpenStack by asset tag
|
|
+ if dmi_chassis_asset_tag_matches "$nova"; then
|
|
+ return ${DS_FOUND}
|
|
+ fi
|
|
+ if dmi_chassis_asset_tag_matches "$compute"; then
|
|
+ return ${DS_FOUND}
|
|
+ fi
|
|
+
|
|
# LP: #1715241 : arch other than intel are not identified properly.
|
|
case "$DI_UNAME_MACHINE" in
|
|
i?86|x86_64) :;;
|