cloud-init

Merge lp:~gholms/cloud-init/fedora-distro into lp:~cloud-init-dev/cloud-init/trunk

  1. fedora-distro
  2. Merge into trunk
Proposed by Garrett Holmstrom
Status: Merged
Merged at revision: 650
Proposed branch: lp:~gholms/cloud-init/fedora-distro
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 10 lines (+2/-1)
1 file modified
cloudinit/distros/fedora.py (+2/-1)
To merge this branch: bzr merge lp:~gholms/cloud-init/fedora-distro
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+124768@code.launchpad.net

Description of the change

The Fedora distro currently lacks a distro_name. Its default user is also not "ubuntu". This commit fixes both.

To post a comment you must log in.
Revision history for this message
Joshua Harlow (harlowja) wrote :

Hmmmm, distro_name as it exists currently doesn't seem to do anything. Not sure why thats in the ubuntu one. Let me investigate a little on that.

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

On Mon, 17 Sep 2012, Joshua Harlow wrote:

> Hmmmm, distro_name as it exists currently doesn't seem to do anything. Not sure why thats in the ubuntu one. Let me investigate a little on that.

Hmm... indeed.
Well, I pulled this and pushed already.
Should have looked more.

Revision history for this message
Joshua Harlow (harlowja) wrote :

No worries. Its just cut a line out since nobody internally to cloud-init is using it (distro class already has a 'name' field also, which comes in from what the yaml named it).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cloudinit/distros/fedora.py'
2--- cloudinit/distros/fedora.py 2012-06-22 19:52:26 +0000
3+++ cloudinit/distros/fedora.py 2012-09-17 18:57:52 +0000
4@@ -28,4 +28,5 @@
5
6
7 class Distro(rhel.Distro):
8- pass
9+ distro_name = 'fedora'
10+ default_user = 'ec2-user'