Merge lp://staging/~therve/cloud-init/fix-landscape-config into lp://staging/~cloud-init-dev/cloud-init/trunk
Proposed by
Thomas Herve
| Status: | Merged |
|---|---|
| Merged at revision: | 649 |
| Proposed branch: | lp://staging/~therve/cloud-init/fix-landscape-config |
| Merge into: | lp://staging/~cloud-init-dev/cloud-init/trunk |
| Diff against target: |
21 lines (+4/-0) 1 file modified
cloudinit/config/cc_landscape.py (+4/-0) |
| To merge this branch: | bzr merge lp://staging/~therve/cloud-init/fix-landscape-config |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| cloud-init Commiters | Pending | ||
|
Review via email:
|
|||
Description of the change
The branch adds the RUN=1 bit to the default file, so that the client starts properly once configured.
To post a comment you must log in.

Thomas, landscape- client unless there is invalid provided in user-data ?
Doesn't this cause us to write /etc/default/
If I understand the current code correctly, we basically no-op if there is no 'landscape' section in cloud-config. (it is a long-winded no-op, but the end result is nothing changed). However, with your change here, we'd be modifying /etc/default/ landscape- client always, without concern of its original content.