Instance hooks now get an INSTANCE_TAGS environment variable, which contains a space-delimited list of the affected instance's tags.
Also update the documentation to reflect the change. Signed-off-by: Apollon Oikonomopoulos <[email protected]> --- doc/hooks.rst | 3 +++ lib/cmdlib.py | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/doc/hooks.rst b/doc/hooks.rst index 77e9330..d276059 100644 --- a/doc/hooks.rst +++ b/doc/hooks.rst @@ -581,6 +581,9 @@ MASTER_CAPABLE VM_CAPABLE Whether the node can host instances. +INSTANCE_TAGS + A space-delimited list of the instance's tags. + NODE_NAME The target node of this operation (not the node on which the hook runs). diff --git a/lib/cmdlib.py b/lib/cmdlib.py index 512c228..ccc520a 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -861,7 +861,7 @@ def _ExpandInstanceName(cfg, name): def _BuildInstanceHookEnv(name, primary_node, secondary_nodes, os_type, status, memory, vcpus, nics, disk_template, disks, - bep, hvp, hypervisor_name): + bep, hvp, hypervisor_name, tags): """Builds instance related env variables for hooks This builds the hook environment from individual variables. @@ -893,6 +893,8 @@ def _BuildInstanceHookEnv(name, primary_node, secondary_nodes, os_type, status, @param hvp: the hypervisor parameters for the instance @type hypervisor_name: string @param hypervisor_name: the hypervisor for the instance + @type tags: list + @param tags: list of instance tags as strings @rtype: dict @return: the hook environment for this instance @@ -940,6 +942,11 @@ def _BuildInstanceHookEnv(name, primary_node, secondary_nodes, os_type, status, env["INSTANCE_DISK_COUNT"] = disk_count + if not tags: + tags = [] + + env["INSTANCE_TAGS"] = " ".join(tags) + for source, kind in [(bep, "BE"), (hvp, "HV")]: for key, value in source.items(): env["INSTANCE_%s_%s" % (kind, key)] = value @@ -1003,6 +1010,7 @@ def _BuildInstanceHookEnvByObject(lu, instance, override=None): 'bep': bep, 'hvp': hvp, 'hypervisor_name': instance.hypervisor, + 'tags': instance.tags, } if override: args.update(override) @@ -8057,6 +8065,7 @@ class LUInstanceCreate(LogicalUnit): bep=self.be_full, hvp=self.hv_full, hypervisor_name=self.op.hypervisor, + tags=self.op.tags, )) return env -- 1.7.2.5
