add INSTANCE_ID to env of bootcmd, add cloud-init-per

the environment varible INSTANCE_ID is set when invoking boothooks from
multi-part input.  However, previously that was not the case for things
run via bootcmd.

This adds cloud-init-per, which makes it easy for user in bootcmd or
boothook to do something per 'instance', 'always', or 'once'.

The functionality in cloud-init-per mostly duplicated what was in
cloud-init-run-module.  That supported "modules", but it is unlikely
that it was used for anything other than "execute".  So, cloud-init-per
now replaces cloud-init-run-module and provides legacy support for
the 'execute' path.

1 files changed, 1 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index b18e2975..a01f2501 100755
--- a/setup.py
+++ b/setup.py
@@ -34,8 +34,8 @@ setup(name='cloud-init',
       url='http://launchpad.net/cloud-init/',
       packages=['cloudinit', 'cloudinit.CloudConfig' ],
       scripts=['cloud-init.py',
-               'cloud-init-run-module.py',
                'cloud-init-cfg.py',
+               'tools/cloud-init-per',
                ],
       data_files=[('/etc/cloud', glob('config/*.cfg')),
                   ('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),