Merge ~smoser/cloud-init:fix/debian-852564-no-hardcoded-udevadm into cloud-init:master

Proposed by Scott Moser on 2017-09-25
Status: Merged
Merged at revision: ad099a53d120e88719a5ad50f29d22e9f7a52bc7
Proposed branch: ~smoser/cloud-init:fix/debian-852564-no-hardcoded-udevadm
Merge into: cloud-init:master
Diff against target: 30 lines (+4/-4)
2 files modified
cloudinit/sources/DataSourceAltCloud.py (+2/-2)
tests/unittests/test_datasource/test_altcloud.py (+2/-2)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve on 2017-09-25
Joshua Powers (community) Approve on 2017-09-25
cloud-init commiters 2017-09-25 Pending
Review via email: mp+331284@code.launchpad.net

Description of the Change

AltCloud: Trust PATH for udevadm and modprobe.

Previously we had hard coded paths in /sbin for the udevadm and modprobe
programs invoked by AltCloud. Its more flexible to expect the PATH to
be set correctly.

Debian: #852564

To post a comment you must log in.
Joshua Powers (powersj) wrote :

LGTM

review: Approve

FAILED: Continuous integration, rev:ad099a53d120e88719a5ad50f29d22e9f7a52bc7
https://jenkins.ubuntu.com/server/job/cloud-init-ci/353/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    FAILED: Ubuntu LTS: Integration

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/353/rebuild

review: Needs Fixing (continuous-integration)

PASSED: Continuous integration, rev:ad099a53d120e88719a5ad50f29d22e9f7a52bc7
https://jenkins.ubuntu.com/server/job/cloud-init-ci/354/
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:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/354/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/sources/DataSourceAltCloud.py b/cloudinit/sources/DataSourceAltCloud.py
2index ed1d691..c78ad9e 100644
3--- a/cloudinit/sources/DataSourceAltCloud.py
4+++ b/cloudinit/sources/DataSourceAltCloud.py
5@@ -28,8 +28,8 @@ LOG = logging.getLogger(__name__)
6 CLOUD_INFO_FILE = '/etc/sysconfig/cloud-info'
7
8 # Shell command lists
9-CMD_PROBE_FLOPPY = ['/sbin/modprobe', 'floppy']
10-CMD_UDEVADM_SETTLE = ['/sbin/udevadm', 'settle', '--timeout=5']
11+CMD_PROBE_FLOPPY = ['modprobe', 'floppy']
12+CMD_UDEVADM_SETTLE = ['udevadm', 'settle', '--timeout=5']
13
14 META_DATA_NOT_SUPPORTED = {
15 'block-device-mapping': {},
16diff --git a/tests/unittests/test_datasource/test_altcloud.py b/tests/unittests/test_datasource/test_altcloud.py
17index 3b274d9..a4dfb54 100644
18--- a/tests/unittests/test_datasource/test_altcloud.py
19+++ b/tests/unittests/test_datasource/test_altcloud.py
20@@ -280,8 +280,8 @@ class TestUserDataRhevm(TestCase):
21 pass
22
23 dsac.CLOUD_INFO_FILE = '/etc/sysconfig/cloud-info'
24- dsac.CMD_PROBE_FLOPPY = ['/sbin/modprobe', 'floppy']
25- dsac.CMD_UDEVADM_SETTLE = ['/sbin/udevadm', 'settle',
26+ dsac.CMD_PROBE_FLOPPY = ['modprobe', 'floppy']
27+ dsac.CMD_UDEVADM_SETTLE = ['udevadm', 'settle',
28 '--quiet', '--timeout=5']
29
30 def test_mount_cb_fails(self):

Subscribers

People subscribed via source and target branches

to all changes: