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

Proposed by Robert Schweikert
Status: Merged
Approved by: Dan Watkins
Approved revision: 338e528962ea1c817825e66d9119e51c3d3f6a71
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~rjschwei/cloud-init:wickedOrder
Merge into: cloud-init:master
Diff against target: 13 lines (+1/-1)
1 file modified
systemd/cloud-init.service.tmpl (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Ryan Harper Approve
Review via email: mp+373166@code.launchpad.net

Commit message

systemd/cloud-init.service.tmpl: start after wicked.service

Change the startup order. On SUSE distros cloud-init.service
should start after wicked.service. This reflects the same
start up order other distributions utilize.

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:92d74d383231920fa3740759040d87674b17c734
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1169/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

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

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

FAILED: Continuous integration, rev:92d74d383231920fa3740759040d87674b17c734
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1170/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

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

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

We've merged a fix for the CI failures in master, if you rebase, then CI will pass and we can land this.

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

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

review: Approve (continuous-integration)
Revision history for this message
Ryan Harper (raharper) :
review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

Commit message lints:
- Line #0 has 88 too many characters. Line starts with: "Change the startup order."...

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
2index 5cb0037..1e5942a 100644
3--- a/systemd/cloud-init.service.tmpl
4+++ b/systemd/cloud-init.service.tmpl
5@@ -14,7 +14,7 @@ After=networking.service
6 After=network.service
7 {% endif %}
8 {% if variant in ["suse"] %}
9-Before=wicked.service
10+After=wicked.service
11 # setting hostname via hostnamectl depends on dbus, which otherwise
12 # would not be guaranteed at this point.
13 After=dbus.service

Subscribers

People subscribed via source and target branches