161d6ab3eb
vendordata.
Vendordata is a datasource provided userdata-like blob that is parsed
similiarly to userdata, execept at the user's pleasure.
cloudinit/config/cc_scripts_vendor.py: added vendor script cloud config
cloudinit/config/cc_vendor_scripts_per_boot.py: added vendor per boot
cloud config
cloudinit/config/cc_vendor_scripts_per_instance.py: added vendor per
instance vendor cloud config
cloudinit/config/cc_vendor_scripts_per_once.py: added per once vendor
cloud config script
doc/examples/cloud-config-vendor-data.txt: documentation of vendor-data
examples
doc/vendordata.txt: documentation of vendordata for vendors
(RENAMED) tests/unittests/test_userdata.py => tests/unittests/test_userdata.py
TO: tests/unittests/test_userdata.py => tests/unittests/test_data.py:
userdata test cases are not expanded to confirm superiority over vendor
data.
bin/cloud-init: change instances of 'consume_userdata' to 'consume_data'
cloudinit/handlers/cloud_config.py: Added vendor script handling to default
cloud-config modules
cloudinit/handlers/shell_script.py: Added ability to change the path key to
support vendor provided 'vendor-scripts'. Defaults to 'script'.
cloudinit/helpers.py:
- Changed ConfigMerger to include handling of vendordata.
- Changed helpers to include paths for vendordata.
cloudinit/sources/__init__.py: Added functions for helping vendordata
- get_vendordata_raw(): returns vendordata unprocessed
- get_vendordata(): returns vendordata through userdata processor
- has_vendordata(): indicator if vendordata is present
- consume_vendordata(): datasource directive for indicating explict
user approval of vendordata consumption. Defaults to 'false'
cloudinit/stages.py: Re-jiggered for handling of vendordata
- _initial_subdirs(): added vendor script definition
- update(): added self._store_vendordata()
- [ADDED] _store_vendordata(): store vendordata
- _get_default_handlers(): modified to allow for filtering
which handlers will run against vendordata
- [ADDED] _do_handlers(): moved logic from consume_userdata
to _do_handlers(). This allows _consume_vendordata() and
_consume_userdata() to use the same code path.
- [RENAMED] consume_userdata() to _consume_userdata()
- [ADDED] _consume_vendordata() for handling vendordata
- run after userdata to get user cloud-config
- uses ConfigMerger to get the configuration from the
instance perspective about whether or not to use
vendordata
- [ADDED] consume_data() to call _consume_{user,vendor}data
cloudinit/util.py:
- [ADDED] get_nested_option_as_list() used by cc_vendor* for
getting a nested value from a dict and returned as a list
- runparts(): added 'exe_prefix' for running exe with a prefix,
used by cc_vendor*
config/cloud.cfg: Added vendor script execution as default
tests/unittests/test_runs/test_merge_run.py: changed consume_userdata() to
consume_data()
tests/unittests/test_runs/test_simple_run.py: changed consume_userdata() to
consume_data()
81 lines
2.7 KiB
Python
81 lines
2.7 KiB
Python
import os
|
|
|
|
from tests.unittests import helpers
|
|
|
|
from cloudinit.settings import (PER_INSTANCE)
|
|
from cloudinit import stages
|
|
from cloudinit import util
|
|
|
|
|
|
class TestSimpleRun(helpers.FilesystemMockingTestCase):
|
|
def _patchIn(self, root):
|
|
self.restore()
|
|
self.patchOS(root)
|
|
self.patchUtils(root)
|
|
|
|
def _pp_root(self, root, repatch=True):
|
|
self.restore()
|
|
for (dirpath, dirnames, filenames) in os.walk(root):
|
|
print(dirpath)
|
|
for f in filenames:
|
|
joined = os.path.join(dirpath, f)
|
|
if os.path.islink(joined):
|
|
print("f %s - (symlink)" % (f))
|
|
else:
|
|
print("f %s" % (f))
|
|
for d in dirnames:
|
|
joined = os.path.join(dirpath, d)
|
|
if os.path.islink(joined):
|
|
print("d %s - (symlink)" % (d))
|
|
else:
|
|
print("d %s" % (d))
|
|
if repatch:
|
|
self._patchIn(root)
|
|
|
|
def test_none_ds(self):
|
|
new_root = self.makeDir()
|
|
self.replicateTestRoot('simple_ubuntu', new_root)
|
|
cfg = {
|
|
'datasource_list': ['None'],
|
|
'write_files': [
|
|
{
|
|
'path': '/etc/blah.ini',
|
|
'content': 'blah',
|
|
'permissions': 0755,
|
|
},
|
|
],
|
|
'cloud_init_modules': ['write-files'],
|
|
}
|
|
cloud_cfg = util.yaml_dumps(cfg)
|
|
util.ensure_dir(os.path.join(new_root, 'etc', 'cloud'))
|
|
util.write_file(os.path.join(new_root, 'etc',
|
|
'cloud', 'cloud.cfg'), cloud_cfg)
|
|
self._patchIn(new_root)
|
|
|
|
# Now start verifying whats created
|
|
initer = stages.Init()
|
|
initer.read_cfg()
|
|
initer.initialize()
|
|
self.assertTrue(os.path.exists("/var/lib/cloud"))
|
|
for d in ['scripts', 'seed', 'instances', 'handlers', 'sem', 'data']:
|
|
self.assertTrue(os.path.isdir(os.path.join("/var/lib/cloud", d)))
|
|
|
|
initer.fetch()
|
|
iid = initer.instancify()
|
|
self.assertEquals(iid, 'iid-datasource-none')
|
|
initer.update()
|
|
self.assertTrue(os.path.islink("var/lib/cloud/instance"))
|
|
|
|
initer.cloudify().run('consume_data',
|
|
initer.consume_data,
|
|
args=[PER_INSTANCE],
|
|
freq=PER_INSTANCE)
|
|
|
|
mods = stages.Modules(initer)
|
|
(which_ran, failures) = mods.run_section('cloud_init_modules')
|
|
self.assertTrue(len(failures) == 0)
|
|
self.assertTrue(os.path.exists('/etc/blah.ini'))
|
|
self.assertIn('write-files', which_ran)
|
|
contents = util.load_file('/etc/blah.ini')
|
|
self.assertEquals(contents, 'blah')
|