From: Marco Platania <platania@research.att.com>
Date: Wed, 15 Nov 2017 14:07:40 +0000 (+0000)
Subject: Merge "fill __docker_version__ in robot_vm template"
X-Git-Tag: 1.0.0-Amsterdam~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=37a126d19e2b213e5b79a2d985f84b6aedd1e3ac;hp=67a7d781637122641820a1447c6964e454459f6d;p=demo.git

Merge "fill __docker_version__ in robot_vm template"
---

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index e916b5dd..27f53270 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -900,6 +900,7 @@ resources:
             __public_net_id__: { get_param: public_net_id }
             __script_version__: { get_param: artifacts_version }
             __robot_repo__: { get_param: robot_repo }
+            __docker_version__: { get_param: robot_docker }
           template: |
             #!/bin/bash