cloud-init

Merge ~harlowja/cloud-init:fix-distro-tags into cloud-init:master

  1. Git
  2. lp:~harlowja/cloud-init
  3. fix-distro-tags
  4. Merge into master
Proposed by Joshua Harlow on 2016-08-01
Status: Merged
Merged at revision: db72092b65ecc57bafe1ac6e81c99115f6bd1936
Proposed branch: ~harlowja/cloud-init:fix-distro-tags
Merge into: cloud-init:master
Diff against target: 65 lines (+10/-0)
5 files modified
cloudinit/config/cc_lxd.py (+2/-0)
cloudinit/config/cc_rh_subscription.py (+2/-0)
cloudinit/config/cc_snappy.py (+2/-0)
cloudinit/config/cc_ubuntu_init_switch.py (+2/-0)
cloudinit/config/cc_yum_add_repo.py (+2/-0)
Reviewer Review Type Date Requested Status
Scott Moser 2016-08-01 Approve on 2016-08-03
Review via email: mp+301730@code.launchpad.net
To post a comment you must log in.
Scott Moser (smoser) wrote :

looks good.
thank you.
go ahead and push, Josh.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/config/cc_lxd.py b/cloudinit/config/cc_lxd.py
2index 70d4e7c..0086840 100644
3--- a/cloudinit/config/cc_lxd.py
4+++ b/cloudinit/config/cc_lxd.py
5@@ -47,6 +47,8 @@ Example config:
6
7 from cloudinit import util
8
9+distros = ['ubuntu']
10+
11
12 def handle(name, cfg, cloud, log, args):
13 # Get config
14diff --git a/cloudinit/config/cc_rh_subscription.py b/cloudinit/config/cc_rh_subscription.py
15index 3a113ae..d4ad724 100644
16--- a/cloudinit/config/cc_rh_subscription.py
17+++ b/cloudinit/config/cc_rh_subscription.py
18@@ -18,6 +18,8 @@
19
20 from cloudinit import util
21
22+distros = ['fedora', 'rhel']
23+
24
25 def handle(name, cfg, _cloud, log, _args):
26 sm = SubscriptionManager(cfg)
27diff --git a/cloudinit/config/cc_snappy.py b/cloudinit/config/cc_snappy.py
28index 1a485ee..6bcd838 100644
29--- a/cloudinit/config/cc_snappy.py
30+++ b/cloudinit/config/cc_snappy.py
31@@ -68,6 +68,8 @@ BUILTIN_CFG = {
32 'config': {},
33 }
34
35+distros = ['ubuntu']
36+
37
38 def parse_filename(fname):
39 fname = os.path.basename(fname)
40diff --git a/cloudinit/config/cc_ubuntu_init_switch.py b/cloudinit/config/cc_ubuntu_init_switch.py
41index 884d79f..bffb438 100644
42--- a/cloudinit/config/cc_ubuntu_init_switch.py
43+++ b/cloudinit/config/cc_ubuntu_init_switch.py
44@@ -86,6 +86,8 @@ else
45 fi
46 """
47
48+distros = ['ubuntu']
49+
50
51 def handle(name, cfg, cloud, log, args):
52 """Handler method activated by cloud-init."""
53diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py
54index 64fba86..22549e6 100644
55--- a/cloudinit/config/cc_yum_add_repo.py
56+++ b/cloudinit/config/cc_yum_add_repo.py
57@@ -23,6 +23,8 @@ import six
58
59 from cloudinit import util
60
61+distros = ['fedora', 'rhel']
62+
63
64 def _canonicalize_id(repo_id):
65 repo_id = repo_id.lower().replace("-", "_")

Subscribers

People subscribed via source and target branches