Set up env variables correctly

Change-Id: I4752510a4e36d8dc19d923a817c7fb687d78fa22
Issue-ID: DCAEGEN2-432
Signed-off-by: Jack Lucas <jflucas@research.att.com>

diff --git a/k8s/k8s-node-type.yaml b/k8s/k8s-node-type.yaml
index 61b6f70..31d4248 100644 (file)
--- a/k8s/k8s-node-type.yaml
+++ b/k8s/k8s-node-type.yaml
@@ -25,7 +25,7 @@ plugins:
   k8s:
     executor: 'central_deployment_agent'
     package_name: k8splugin
-    package_version: 1.0.0
+    package_version: 1.0.1
 
 data_types:
 

diff --git a/k8s/k8splugin/tasks.py b/k8s/k8splugin/tasks.py
index 1718274..8fcb582 100644 (file)
--- 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)

diff --git a/k8s/pom.xml b/k8s/pom.xml
index 4f09ef5..ededd75 100644 (file)
--- a/k8s/pom.xml
+++ b/k8s/pom.xml
@@ -28,7 +28,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <groupId>org.onap.dcaegen2.platform.plugins</groupId>
   <artifactId>k8s</artifactId>
   <name>k8s-plugin</name>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/k8s/setup.py b/k8s/setup.py
index f160777..2d17dc4 100644 (file)
--- a/k8s/setup.py
+++ b/k8s/setup.py
@@ -23,7 +23,7 @@ from setuptools import setup
 setup(
     name='k8splugin',
     description='Cloudify plugin for containerized components deployed using Kubernetes',
-    version="1.0.0",
+    version="1.0.1",
     author='J. F. Lucas, Michael Hwang, Tommy Carpenter',
     packages=['k8splugin','k8sclient','msb','configure'],
     zip_safe=False,