lp:~smoser/cloud-init/trunk.mcollective-cleanup

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~cloud-init-dev/cloud-init/trunk

Server Team CI bot: Needs Fixing (continuous-integration) on 2016-07-20

Sergii Golovatiuk (community): Approve on 2016-07-19

cloud-init Commiters: Pending requested 2016-07-18

Diff: 298 lines (+176/-62)

2 files modified

cloudinit/config/cc_mcollective.py (+52/-44)
tests/unittests/test_handler/test_handler_mcollective.py (+124/-18)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1260. By Scott Moser on 2016-07-19

whitespace

1259. By Scott Moser on 2016-07-19

test dictionary in config

1258. By Scott Moser on 2016-07-19

move most of handle to apply_config, change tests.

1257. By Scott Moser on 2016-07-18

add some tests and cleanups for mcollective

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.
 - improve test coverage

1256. By Scott Moser on 2016-07-14

improvements to eni rendering

Some improvements here, and some bug fixes.
 - bring curtin revno 394's to support post-up for interface aliases.
 - sort attributes per interface for nicer order and consistent rendering
 - use arrays for each 'section' rather than content += . This allows
   better separation of the sections and also will perform better as long
   strings with += are slow.
 - improve how 'lo' is handled. If a network state that was being rendered
   had an entry for 'lo', then the rendered ENI would have 2 'lo'
   sections.
 - no longer skip 'lo' sections when loading an ENI in parse_deb_config
 - fix inet value for subnets, don't add interface attributes to alias
   (LP: #1588547)

Also add some tests of reading yaml and rendering ENI.

1255. By Scott Moser on 2016-07-14

ConfigDrive: fix writing of 'injected' files and legacy networking

Previous commit inadvertently disabled the consumption of 'injected' files
in configdrive (openstack server boot --file=/target/file=local-file)
unless the datasource was in 'pass' mode. The default mode is 'net' so
that was not likely to happen.

Also here are:
a.) some comments to apply_network_config

b.) add backwards compatibility for distros that do not yet implement
    apply_network_config by converting the network config into ENI format
    and calling apply_network.

    This is required because prior to the previous commit, those distros
    would have had 'apply_network' called with the openstack provided
    ENI file. But after this change they will have apply_network_config
    called by cloudinit's main.

c.) add network_state_to_eni for converting net config to eni
    it supports the not-actually-correct 'hwaddress' field in ENI

1254. By Scott Moser on 2016-07-14

Fix mcollective module with python3

fixes mcollective when used with python3 and also adds a unit test.

1253. By Joshua Harlow on 2016-07-13

Fix SmartOS datasource usage of dict comprehensions

1252. By Joshua Harlow on 2016-07-13

String format requires positions on python 2.6

1251. By Joshua Harlow on 2016-07-13

Another stray occurence of a dict comprehension being removed