x
/
cloud-init
Code Issues Proposed changes

change: Install everything in the right location on both Linux (which 

ofcourse already was good) and FreeBSD (which realy likes /usr/local
for this).
This commit is contained in:
Harm Weites 2014-08-10 11:50:19 +00:00
parent b4edd02e07
commit 35236255a0
2 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
setup.py
View File

@ -90,6 +90,42 @@ def read_requires():
return str(deps).splitlines()
# Install everything in the right location and take care of Linux (default) and
# FreeBSD systems.
def read_datafiles():
sysname = os.uname()[0]
if sysname == 'FreeBSD':
return [
('/usr/local/etc/cloud', glob('config/*.cfg')),
('/usr/local/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
('/usr/local/etc/cloud/templates', glob('templates/*')),
('/usr/local/share/cloud-init', []),
('/usr/local/lib/cloud-init',
['tools/uncloud-init', 'tools/write-ssh-key-fingerprints']),
('/usr/local/share/doc/cloud-init',
[f for f in glob('doc/*') if is_f(f)]),
('/usr/local/share/doc/cloud-init/examples',
[f for f in glob('doc/examples/*') if is_f(f)]),
('/usr/local/share/doc/cloud-init/examples/seed',
[f for f in glob('doc/examples/seed/*') if is_f(f)]),
]
else:
return [
('/etc/cloud', glob('config/*.cfg')),
('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
('/etc/cloud/templates', glob('templates/*')),
('/usr/share/cloud-init', []),
('/usr/lib/cloud-init',
['tools/uncloud-init', 'tools/write-ssh-key-fingerprints']),
('/usr/share/doc/cloud-init',
[f for f in glob('doc/*') if is_f(f)]),
('/usr/share/doc/cloud-init/examples',
[f for f in glob('doc/examples/*') if is_f(f)]),
('/usr/share/doc/cloud-init/examples/seed',
[f for f in glob('doc/examples/seed/*') if is_f(f)]),
]
# TODO: Is there a better way to do this??
class InitsysInstallData(install):
init_system = None
@ -138,20 +174,7 @@ setuptools.setup(name='cloud-init',
'tools/cloud-init-per',
],
license='GPLv3',
data_files=[('/etc/cloud', glob('config/*.cfg')),
('/etc/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
('/etc/cloud/templates', glob('templates/*')),
('/usr/share/cloud-init', []),
('/usr/lib/cloud-init',
['tools/uncloud-init',
'tools/write-ssh-key-fingerprints']),
('/usr/share/doc/cloud-init',
[f for f in glob('doc/*') if is_f(f)]),
('/usr/share/doc/cloud-init/examples',
[f for f in glob('doc/examples/*') if is_f(f)]),
('/usr/share/doc/cloud-init/examples/seed',
[f for f in glob('doc/examples/seed/*') if is_f(f)]),
],
data_files=read_datafiles(),
install_requires=read_requires(),
cmdclass={
# Use a subclass for install that handles

4
tools/build-on-freebsd
View File

@ -17,9 +17,7 @@ touch /tmp/c-i.dependencieschecked
python setup.py build
python setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd
# Move the configdir to /usr/local/ and use freebsd.cfg:
[ -d /usr/local/etc/cloud ] && rm -rf /usr/local/etc/cloud
mv /etc/cloud /usr/local/etc/
# Use the correct config file:
mv /usr/local/etc/cloud/cloud.freebsd.cfg /usr/local/etc/cloud/cloud.cfg
# Enable cloud-init in /etc/rc.conf: