cloud-init

Merge ~b1sandmann/cloud-init:fix-debian-template into cloud-init:master

  1. Git
  2. lp:~b1sandmann/cloud-init
  3. fix-debian-template
  4. Merge into master
Proposed by Jens Sandmann
Status: Merged
Approved by: Scott Moser
Approved revision: 3a2b706697ddc21d8ef2649f5a350da74cc920ef
Merged at revision: 777f6ca3318edd739ef351ece31de311cb96bd9a
Proposed branch: ~b1sandmann/cloud-init:fix-debian-template
Merge into: cloud-init:master
Diff against target: 21 lines (+2/-2)
1 file modified
templates/hosts.debian.tmpl (+2/-2)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
cloud-init Commiters Pending
Review via email: mp+325478@code.launchpad.net

Description of the change

debian: fix path comment in /etc/hosts template.

The comments in the debian template file of /etc/hosts still pointed to a
general template file instead of the debian one. Fixes bug

LP: #1606406

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

PASSED: Continuous integration, rev:3a2b706697ddc21d8ef2649f5a350da74cc920ef
https://jenkins.ubuntu.com/server/job/cloud-init-ci/510/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/510
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/510
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/510
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/510
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/510

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

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

Thank you Jens,
I'll pull this shortly.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/hosts.debian.tmpl b/templates/hosts.debian.tmpl
2index a1d9721..7e29907 100644
3--- a/templates/hosts.debian.tmpl
4+++ b/templates/hosts.debian.tmpl
5@@ -1,6 +1,6 @@
6 ## template:jinja
7 {#
8-This file (/etc/cloud/templates/hosts.tmpl) is only utilized
9+This file (/etc/cloud/templates/hosts.debian.tmpl) is only utilized
10 if enabled in cloud-config. Specifically, in order to enable it
11 you need to add the following to config:
12 manage_etc_hosts: True
13@@ -8,7 +8,7 @@ you need to add the following to config:
14 # Your system has configured 'manage_etc_hosts' as True.
15 # As a result, if you wish for changes to this file to persist
16 # then you will need to either
17-# a.) make changes to the master file in /etc/cloud/templates/hosts.tmpl
18+# a.) make changes to the master file in /etc/cloud/templates/hosts.debian.tmpl
19 # b.) change or remove the value of 'manage_etc_hosts' in
20 # /etc/cloud/cloud.cfg or cloud-config from user-data
21 #

Subscribers

People subscribed via source and target branches