Merge ~raharper/cloud-init:fix/cloud-init-generator-ds-identify-path into cloud-init:master

Proposed by Ryan Harper
Status: Merged
Approved by: Ryan Harper
Approved revision: ec94aa82f8330c2c88a120b7116f035099e4fd63
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~raharper/cloud-init:fix/cloud-init-generator-ds-identify-path
Merge into: cloud-init:master
Diff against target: 18 lines (+6/-1)
1 file modified
systemd/cloud-init-generator.tmpl (+6/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Dan Watkins Approve
Review via email: mp+368979@code.launchpad.net

Commit message

cloud-init-generator: use libexec path to ds-identify on redhat systems

Update the template to use libexec prefix path to ds-identify on redhat
systems.

LP: #1833264

To post a comment you must log in.
Revision history for this message
Dan Watkins (oddbloke) wrote :

LGTM, thanks.

I notice in a log file that I have lying around that we also call /usr/lib/cloud-init/write-ssh-key-fingerprints; does that need a similar update?

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/cloud-init-autoland-test/249/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    FAILED: Ubuntu LTS: Build

review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:ec94aa82f8330c2c88a120b7116f035099e4fd63
https://jenkins.ubuntu.com/server/job/cloud-init-ci/741/
Executed test runs:
    FAILED: Checkout

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:ec94aa82f8330c2c88a120b7116f035099e4fd63
https://jenkins.ubuntu.com/server/job/cloud-init-ci/744/
Executed test runs:
    IN_PROGRESS: Declarative: Post Actions

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:ec94aa82f8330c2c88a120b7116f035099e4fd63
https://jenkins.ubuntu.com/server/job/cloud-init-ci/745/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

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

review: Approve (continuous-integration)
Revision history for this message
Ryan Harper (raharper) wrote :

OK, try to land once more

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/systemd/cloud-init-generator.tmpl b/systemd/cloud-init-generator.tmpl
2index cfa5eb5..45efa24 100755
3--- a/systemd/cloud-init-generator.tmpl
4+++ b/systemd/cloud-init-generator.tmpl
5@@ -82,7 +82,12 @@ default() {
6 }
7
8 check_for_datasource() {
9- local ds_rc="" dsidentify="/usr/lib/cloud-init/ds-identify"
10+ local ds_rc=""
11+{% if variant in ["redhat", "fedora", "centos"] %}
12+ local dsidentify="/usr/libexec/cloud-init/ds-identify"
13+{% else %}
14+ local dsidentify="/usr/lib/cloud-init/ds-identify"
15+{% endif %}
16 if [ ! -x "$dsidentify" ]; then
17 debug 1 "no ds-identify in $dsidentify. _RET=$FOUND"
18 return 0

Subscribers

People subscribed via source and target branches