Merge lp:~harlowja/cloud-init/cloud-init-tag-distros into lp:~cloud-init-dev/cloud-init/trunk

[Joshua Harlow]

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:1259
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~harlowja/cloud-init/cloud-init-tag-distros/+merge/300840/+edit-commit-message

https://server-team-jenkins.canonical.com/job/cloud-init-ci/34/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/lp-vote-on-merge/8/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/cloud-init-ci/34/rebuild

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

Hello,
Thank you for taking the time to contribute to cloud-init. Cloud-init has moved its revision control system to git. As a result, we are marking all bzr merge proposals as 'rejected'. If you would like to re-submit this proposal for review, please do so by following the current HACKING documentation at http://cloudinit.readthedocs.io/en/latest/topics/hacking.html .

fwiw, I think the changes here are actually merged.

Unmerged revisions

1259. By Joshua Harlow on 2016-07-22

Add distro tags on config modules that should have it

Some of these really won't work to well on non-supporting
distros so to avoid further user pain tag this with the
supported distros where they should work.

=== modified file 'cloudinit/config/cc_lxd.py'
--- cloudinit/config/cc_lxd.py	2016-06-03 04:42:22 +0000
+++ cloudinit/config/cc_lxd.py	2016-07-22 07:10:01 +0000
@@ -47,6 +47,8 @@
 
 from cloudinit import util
 
+distros = ['ubuntu']
+
 
 def handle(name, cfg, cloud, log, args):
     # Get config

=== modified file 'cloudinit/config/cc_rh_subscription.py'
--- cloudinit/config/cc_rh_subscription.py	2016-04-06 17:57:00 +0000
+++ cloudinit/config/cc_rh_subscription.py	2016-07-22 07:10:01 +0000
@@ -18,6 +18,8 @@
 
 from cloudinit import util
 
+distros = ['fedora', 'rhel']
+
 
 def handle(name, cfg, _cloud, log, _args):
     sm = SubscriptionManager(cfg)

=== modified file 'cloudinit/config/cc_snappy.py'
--- cloudinit/config/cc_snappy.py	2016-05-12 17:56:26 +0000
+++ cloudinit/config/cc_snappy.py	2016-07-22 07:10:01 +0000
@@ -68,6 +68,8 @@
     'config': {},
 }
 
+distros = ['ubuntu']
+
 
 def parse_filename(fname):
     fname = os.path.basename(fname)

=== modified file 'cloudinit/config/cc_ubuntu_init_switch.py'
--- cloudinit/config/cc_ubuntu_init_switch.py	2016-05-12 17:56:26 +0000
+++ cloudinit/config/cc_ubuntu_init_switch.py	2016-07-22 07:10:01 +0000
@@ -86,6 +86,8 @@
 fi
 """
 
+distros = ['ubuntu']
+
 
 def handle(name, cfg, cloud, log, args):
     """Handler method activated by cloud-init."""

=== modified file 'cloudinit/config/cc_yum_add_repo.py'
--- cloudinit/config/cc_yum_add_repo.py	2016-03-03 22:20:10 +0000
+++ cloudinit/config/cc_yum_add_repo.py	2016-07-22 07:10:01 +0000
@@ -23,6 +23,8 @@
 
 from cloudinit import util
 
+distros = ['fedora', 'rhel']
+
 
 def _canonicalize_id(repo_id):
     repo_id = repo_id.lower().replace("-", "_")