From af26b8bb3e0145a093f84be270755cc2d475317e Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Thu, 5 Apr 2018 21:44:07 +0000 Subject: Set up env variables correctly Change-Id: I4752510a4e36d8dc19d923a817c7fb687d78fa22 Issue-ID: DCAEGEN2-432 Signed-off-by: Jack Lucas --- k8s/k8splugin/tasks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'k8s/k8splugin/tasks.py') diff --git a/k8s/k8splugin/tasks.py b/k8s/k8splugin/tasks.py index 1718274..8fcb582 100644 --- a/k8s/k8splugin/tasks.py +++ b/k8s/k8splugin/tasks.py @@ -272,7 +272,7 @@ def _create_and_start_container(container_name, image, **kwargs): - volumes: array of volume objects, where a volume object is: {"host":{"path": "/path/on/host"}, "container":{"bind":"/path/on/container","mode":"rw_or_ro"} - ports: array of strings in the form "container_port:host_port" - - env: map of name-value pairs ( {name0: value0, name1: value1...} ) + - envs: map of name-value pairs ( {name0: value0, name1: value1...} ) - always_pull: boolean. If true, sets image pull policy to "Always" so that a fresh copy of the image is always pull. Otherwise, sets image pull policy to "IfNotPresent" @@ -283,7 +283,7 @@ def _create_and_start_container(container_name, image, **kwargs): ''' env = { "CONSUL_HOST": CONSUL_INTERNAL_NAME, "CONFIG_BINDING_SERVICE": "config-binding-service" } - env.update(kwargs.get("env", {})) + env.update(kwargs.get("envs", {})) ctx.logger.info("Deploying {}, image: {}, env: {}, kwargs: {}".format(container_name, image, env, kwargs)) ctx.logger.info("Passing k8sconfig: {}".format(plugin_conf)) replicas = kwargs.get("replicas", 1) -- cgit 1.2.3-korg