cloud-init

Merge ~smoser/cloud-init:bug/1767131-snap-seeded into cloud-init:master

  1. Git
  2. lp:~smoser/cloud-init
  3. bug/1767131-snap-seeded
  4. Merge into master
Proposed by Scott Moser
Status: Merged
Approved by: Scott Moser
Approved revision: b21b8e319fc6fd4ba08962a0b50f4da08de41daa
Merge reported by: Scott Moser
Merged at revision: d5374bba2f1b4607a773ebff00e1ee7d66e23033
Proposed branch: ~smoser/cloud-init:bug/1767131-snap-seeded
Merge into: cloud-init:master
Diff against target: 12 lines (+1/-0)
1 file modified
systemd/cloud-config.service.tmpl (+1/-0)
Reviewer Review Type Date Requested Status
Ryan Harper Approve
Server Team CI bot continuous-integration Approve
Dan Watkins Approve
Michael Vogt Pending
Review via email: mp+345365@code.launchpad.net

Commit message

cloud-config.service: run After snap.seeded.service.

This makes cloud-config.service (and as a result cloud-final.service)
run After snap.seeded.service. This is required to ensure that
pre-seeded snaps can be used by cloud-init or user-data input.

The snap.seeded.service was added to snapd at:
  https://github.com/snapcore/snapd/pull/5124

Note that the following would be a workaround:
 snap:
  commands:
   00: snap wait system seed.loaded

LP: #1767131

Description of the change

see commit message

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

This LGTM.

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

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

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

The github PR shows the command to be:

snap wait-seeded

That command doesn't appear to be available just yet.
The unit file change is fine, the commit message should be
updated to match the committed command.

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

@Ryan,

the github PR initial comment says 'snap wait-seeded'.
but i'm pretty sure that changed over the l ife of the review to

https://github.com/snapcore/snapd/pull/5124/files#diff-997446fe2a694de53de6bd8f74708e92R7

Revision history for this message
Scott Moser (smoser) wrote :

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/cloud-init/commit/?id=d5374bba

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/systemd/cloud-config.service.tmpl b/systemd/cloud-config.service.tmpl
2index bdee3ce..9d928ca 100644
3--- a/systemd/cloud-config.service.tmpl
4+++ b/systemd/cloud-config.service.tmpl
5@@ -2,6 +2,7 @@
6 [Unit]
7 Description=Apply the settings specified in cloud-config
8 After=network-online.target cloud-config.target
9+After=snapd.seeded.service
10 Wants=network-online.target cloud-config.target
11
12 [Service]

Subscribers

People subscribed via source and target branches