cloud-init

Merge ~rjschwei/cloud-init:noAptButDeb into cloud-init:master

  1. Git
  2. lp:~rjschwei/cloud-init
  3. noAptButDeb
  4. Merge into master
Proposed by Robert Schweikert
Status: Merged
Approved by: Scott Moser
Approved revision: d08bcbe2a4494ae374d5649733b4b9b1e95d7615
Merged at revision: 6f2aaf7b0fa9fd9376561e9b6233b4d36de51da1
Proposed branch: ~rjschwei/cloud-init:noAptButDeb
Merge into: cloud-init:master
Diff against target: 16 lines (+2/-1)
1 file modified
systemd/cloud-final.service.tmpl (+2/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
cloud-init Commiters Pending
Review via email: mp+331251@code.launchpad.net

Description of the change

Ordering on apt service should only be set up on Debian based distributions

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Scott Moser (smoser) wrote :

This general change is probably fine.
But I'd just like to point out that there is nothing wrong with declaring 'Before=' or 'After=' on services that are not present in a systemd system.

Ie, the change here is *only* to remove the string 'Before=apt-daily.service' from the .service file shipped for suse.

There is *no* change in boot as a result.

Revision history for this message
Robert Schweikert (rjschwei) wrote :

Correct no change in behavior for anyone. I just think it is potentially confusing for someone reading the .service file.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/systemd/cloud-final.service.tmpl b/systemd/cloud-final.service.tmpl
2index fc01b89..e2b9125 100644
3--- a/systemd/cloud-final.service.tmpl
4+++ b/systemd/cloud-final.service.tmpl
5@@ -4,9 +4,10 @@ Description=Execute cloud user/final scripts
6 After=network-online.target cloud-config.service rc-local.service
7 {% if variant in ["ubuntu", "unknown", "debian"] %}
8 After=multi-user.target
9+Before=apt-daily.service
10 {% endif %}
11 Wants=network-online.target cloud-config.service
12-Before=apt-daily.service
13+
14
15 [Service]
16 Type=oneshot

Subscribers

People subscribed via source and target branches