~harlowja/cloud-init:fix-distro-tags

Branch merges

Merged into cloud-init:master at revision db72092b65ecc57bafe1ac6e81c99115f6bd1936

Scott Moser: Approve on 2016-08-03

Diff: 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)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

4c168e8... by Joshua Harlow on 2016-07-25

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.

eed7fcc... by Scott Moser on 2016-07-29

fix pep8 errors in mcollective unit tests

Just fix the pep8 errors added in previous commit.

4264783... by Scott Moser on 2016-07-19

mcollective: add tests, cleanups and bug fix when no config in /etc.

Things here:
 - restart rather than 'start' the service, to pick up a config change
   that we would have written.
 - update the config and write cert files whether or not the file
   existed on the system. Previously it would only write the cert
   files if /etc/mcollective/server.cfg already existed.
 - improve test coverage

6764452... by Joshua Harlow on 2016-07-19

Avoid depending on argparse in 2.7 or greater

At least (currently) for rhel7 the argparse package does
not get installed (even though rpm say it is installed by
the python core package) and this causes things that mention
argparse in there requirements to not believe that argparse
is installed (even though it is) so to avoid this whole mess
we can just avoid depending on argparse in python versions
where we don't need to (since it was included in the stdlib
in python 2.7+)

35b902c... by Joshua Harlow on 2016-07-15

Avoid depending on argparse in 2.7 or greater

Its not needed since its a built-in for these
versions so we can just skip it for any newer
rpm building in the first place.

LP: #1603533

333eea5... by Joshua Harlow on 2016-07-13

Fix SmartOS datasource usage of dict comprehensions

ba55775... by Joshua Harlow on 2016-07-13

String format requires positions on python 2.6

f5ea273... by Joshua Harlow on 2016-07-13

Another stray occurence of a dict comprehension being removed

78a8524... by Joshua Harlow on 2016-07-13

Remove another stray dict comprehension

a30eebe... by Joshua Harlow on 2016-07-13

Fixes missing/unpacked rpm files

There are a few new files that are missing from being
included in the rpm specification file (which if missing
causes rpmbuild to die) so make sure we add them in.