cc_landscape: do nothing if config not give. install landscape-client.
This commit is contained in:
commit
70bce4b917
@ -1,6 +1,8 @@
|
||||
0.7.1:
|
||||
- sysvinit: fix missing dependency in cloud-init job for RHEL 5.6
|
||||
- config-drive: map hostname to local-hostname (LP: #1061964)
|
||||
- landscape: install landscape-client package if not installed.
|
||||
only take action if cloud-config is present (LP: #1066115)
|
||||
0.7.0:
|
||||
- add a 'exception_cb' argument to 'wait_for_url'. If provided, this
|
||||
method will be called back with the exception received and the message.
|
||||
|
@ -59,6 +59,10 @@ def handle(_name, cfg, cloud, log, _args):
|
||||
raise RuntimeError(("'landscape' key existed in config,"
|
||||
" but not a dictionary type,"
|
||||
" is a %s instead"), util.obj_name(ls_cloudcfg))
|
||||
if not ls_cloudcfg:
|
||||
return
|
||||
|
||||
cloud.distro.install_packages(["landscape-client"])
|
||||
|
||||
merge_data = [
|
||||
LSC_BUILTIN_CFG,
|
||||
@ -79,8 +83,7 @@ def handle(_name, cfg, cloud, log, _args):
|
||||
util.write_file(lsc_client_fn, contents.getvalue())
|
||||
log.debug("Wrote landscape config file to %s", lsc_client_fn)
|
||||
|
||||
if ls_cloudcfg:
|
||||
util.write_file(LS_DEFAULT_FILE, "RUN=1\n")
|
||||
util.write_file(LS_DEFAULT_FILE, "RUN=1\n")
|
||||
|
||||
|
||||
def merge_together(objs):
|
||||
|
Loading…
x
Reference in New Issue
Block a user