lp:~harlowja/cloud-init/fix-resets

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~cloud-init-dev/cloud-init/trunk at revision 703

Scott Moser: Approve on 2012-11-09

Diff: 310 lines (+169/-63)

6 files modified

cloudinit/stages.py (+28/-3)
tests/data/user_data.1.txt (+15/-0)
tests/unittests/test_merging.py (+62/-0)
tests/unittests/test_runs/test_merge_run.py (+52/-0)
tests/unittests/test_util.py (+0/-59)
tools/run-pep8 (+12/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1076811: Cloud-init modules do not reflect loaded config

High

Fix Released

Link a bug report

Related blueprints

703. By Joshua Harlow on 2012-11-09

Ensure that at needed stages the local variables
of the init class are reset so that when they are
regenerated that they will use the updated data
instead of using previous data (since they weren't reset).

702. By Scott Moser on 2012-11-08

improve zsh support in tools/Z99-cloud-locale-test.sh

This change does 3 things:
 * revert the fix from revno 697
 * minor clean up some local variable usage and definition
 * make Z99-cloud-locale-test.sh actually work when shell is zsh

the last is done by detecting if this is zsh, and if so, changing the zsh
behavior for this function to emulate sh. As a result of the '-L' in
'emulate -L sh', we have no negative affect on the user's shell.

701. By Scott Moser on 2012-11-07

remove dead code from DataSourceEc2

700. By Joshua Harlow on 2012-11-07

test and path cleanups.

1. Remove the usage of the path.join function now that all code should
   be going through the util file methods (and they can be mocked out as
   needed).
2. Adjust all occurences of the above join function to either not use it
   or replace it with the standard os.path.join (which can also be mocked
   out as needed)
3. Fix pylint from complaining about the tests folder 'helpers.py' not
   being found.
4. Add a pylintrc file that is used instead of the options hidden in the
   'run_pylint' tool.

699. By Scott Moser on 2012-11-07

Add a more generic package install mechansim

This splits code in apt_update_upgrade into 'apt-update-upgrade' and
'apt-configure' and 'package-update-upgrade-install'.
The 'package-update-upgrade-install' then uses the generic distro
package mechanisms for acheiving the same goal.

Also, adjusts some of the reboot backoffs and log flushing/sleeping that was
happening there.

698. By Joshua Harlow on 2012-11-07

support unicode in user-data input of unknown types

Fix the case where a unknown type is seen and it has contents which are in
unicode. That caused python to blow-up when this happens since
'string-escape' doesn't work on unicode (at least in 2.6).

697. By Scott Moser on 2012-11-06

tools/Z99-cloud-locale-test.sh: avoid warning when shell is zsh

696. By Scott Moser on 2012-10-23

use only util methods for reading/loading/appending/peeking

Use only util methods for reading/loading/appending/peeking
at files since it is likely soon that we will add a new
way of adjusting the root of files read, also it is useful
for debugging to track what is being read/written in a central
fashion.

695. By Scott Moser on 2012-10-23

Add helpers for wrapping file operations

Add a new example test that will patch utils and os
functions so that they can be 'retargeted' to a temporary
directory, which allows us the ability to run a full set
of cloud-init stages.

Neat things:

1. All cloud-init code is unchanged (as long as it goes
   through the utils functions for most functionality)
2. Allows for a natural way to setup a temporary directory
   then patch the new directory as the new 'root' and then
   run cloud-init stages and then check the contents of
   what was placed as desired.

Note:
 This is now exposing what I think was just an issue in
 ./tools/run-pylint.
 ./tools/run-pylint ./tests/unittests/test_filters/test_launch_index.py
and
 ./tools/run-pylint ./tests/unittests/test_simple_run
 was always failing, but now I'm seeing errors.

need to fix that. any tests that 'import helper' have issues.

694. By Joshua Harlow on 2012-10-23

No need for the get default
users groups function when
its provided by the get user
function.