From 00b19244b9e3a88ff6252494e43268ba692815a6 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Wed, 20 Jun 2012 16:34:09 -0700 Subject: 1. Add a comment that the upstart dir should probably be put elsewhere sometime (in a distro specific build?) since not all distros fully support upstart that is in config here or even have upstart in general at all (for various reasons) 2. Found out that we really do need to specify these 2 packages due to the following a. The cloudinit root needs to be a package (pretty obvious) b. Not so obvious is the cloudinit.conf also needs to be a package so that its modules can be directly imported without referring to the module name. --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 9ee58b9a..d2e022f0 100755 --- a/setup.py +++ b/setup.py @@ -26,7 +26,6 @@ import os import re from distutils.core import setup -from setuptools import find_packages def is_f(p): @@ -69,13 +68,17 @@ setup(name='cloud-init', author='Scott Moser', author_email='scott.moser@canonical.com', url='http://launchpad.net/cloud-init/', - packages=find_packages(), + # This second package referencing cloudinit.conf.* + # makes the config modules accessible to the whole + # import system... + packages=['cloudinit', 'cloudinit.conf'], scripts=['bin/cloud-init', 'tools/cloud-init-per', ], data_files=[('/etc/cloud', glob('config/*.cfg')), ('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')), ('/etc/cloud/templates', glob('templates/*')), + # Only really need for upstart based systems ('/etc/init', glob('upstart/*.conf')), ('/usr/share/cloud-init', []), ('/usr/lib/cloud-init', -- cgit v1.2.3