cloud-init

Merge ~goneri/cloud-init:freebsd_config into cloud-init:master

  1. Git
  2. lp:~goneri/cloud-init
  3. freebsd_config
  4. Merge into master
Proposed by Gonéri Le Bouder
Status: Merged
Approved by: Chad Smith
Approved revision: 0823154969d63b258e209abd84f3930449b43a38
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~goneri/cloud-init:freebsd_config
Merge into: cloud-init:master
Diff against target: 13 lines (+1/-1)
1 file modified
tools/render-cloudcfg (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Chad Smith Approve
Ryan Harper Needs Information
Review via email: mp+367315@code.launchpad.net

Commit message

freebsd: fix the name of cloudcfg VARIANT

config/cloud.cfg.tmpl uses 'freebsd', not 'bsd' to identify FreeBSD.

To post a comment you must log in.
Revision history for this message
Ryan Harper (raharper) wrote :

I'm not inclined to take this generic change at this point. Rather, bsd seems fine until we have code that is freebsd specific that some other bsd doesn't work with.

review: Needs Information
Revision history for this message
Gonéri Le Bouder (goneri) wrote :

My commit message was rather short, sorry for that. The thing is, the template already uses 'freebsd':

cloud.cfg.tmpl:{% if variant in ["freebsd", "netbsd"] %}
cloud.cfg.tmpl:{% if variant in ["freebsd"] %}
cloud.cfg.tmpl:{% if variant in ["freebsd"] %}
cloud.cfg.tmpl:{% if variant not in ["freebsd", "netbsd"] %}
cloud.cfg.tmpl:{% if variant not in ["freebsd", "netbsd"] %}
cloud.cfg.tmpl:{% if variant not in ["freebsd", "netbsd"] %}
cloud.cfg.tmpl:{% if variant not in ["freebsd", "netbsd"] %}
cloud.cfg.tmpl:{% if variant in ["centos", "debian", "fedora", "rhel", "suse", "ubuntu", "freebsd", "netbsd"] %}
cloud.cfg.tmpl:{% elif variant in ["freebsd"] %}
cloud.cfg.tmpl: name: freebsd
cloud.cfg.tmpl:{% if variant in ["freebsd"] %}
cloud.cfg.tmpl: renderers: ['freebsd']

Revision history for this message
Gonéri Le Bouder (goneri) wrote :

I mean (master branch):

cloud.cfg.tmpl:{% if variant in ["freebsd"] %}
cloud.cfg.tmpl:{% if variant in ["freebsd"] %}
cloud.cfg.tmpl:{% if variant in ["freebsd"] %}
cloud.cfg.tmpl:{% if variant not in ["freebsd"] %}
cloud.cfg.tmpl:{% if variant not in ["freebsd"] %}
cloud.cfg.tmpl:{% if variant not in ["freebsd"] %}
cloud.cfg.tmpl:{% if variant not in ["freebsd"] %}
cloud.cfg.tmpl:{% if variant in ["centos", "debian", "fedora", "rhel", "suse", "ubuntu", "freebsd"] %}
cloud.cfg.tmpl:{% elif variant in ["freebsd"] %}
cloud.cfg.tmpl: name: freebsd

Revision history for this message
Ryan Harper (raharper) wrote :

I see, see comment inline.

Revision history for this message
Gonéri Le Bouder (goneri) :
Revision history for this message
Chad Smith (chad.smith) wrote :

This looks sane/expected to me given that the callers (setup.py or direct running of tools/render-cloudcfg) will need to pass a freebsd variant at the moment to actually generate a valid cfg template.

review: Approve
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/tools/render-cloudcfg b/tools/render-cloudcfg
2index 8b7cb87..0957c32 100755
3--- a/tools/render-cloudcfg
4+++ b/tools/render-cloudcfg
5@@ -4,7 +4,7 @@ import argparse
6 import os
7 import sys
8
9-VARIANTS = ["bsd", "centos", "fedora", "rhel", "suse", "ubuntu", "unknown"]
10+VARIANTS = ["freebsd", "centos", "fedora", "rhel", "suse", "ubuntu", "unknown"]
11
12 if "avoid-pep8-E402-import-not-top-of-file":
13 _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))

Subscribers

People subscribed via source and target branches