commit 92eb3a3806c2be540693dd7ba1ebbbec2d7e0e80
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Jul 16 09:17:38 2019 +0000
committer Gerrit Code Review <mail@domain.com> Tue Jul 16 09:17:38 2019 +0000
tree 24e5d032e721b60d551666065893f30cc322ca90
parent 815d502b974a0efaa729c718d2709785217b6126
parent 67d7de9b31b3b7569d14afeb18b4ae1383ca4ce6

Merge "Install python-tornado with OS CP/DP upgrade"

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index ea513b7..29f03fe 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -347,7 +347,7 @@
                 }
 
                 for (i in common.entries(smc)) {
-                    sh "sed -i 's,export ${i[0]}=.*,export ${i[0]}=\"${i[1]}\",' user_data"
+                    sh "sed -i 's,export ${i[0]}=.*,export ${i[0]}=\${${i[0]}:-\"${i[1]}\"},' user_data"
                 }
 
                 // calculate netmask