commit 85ddf0d708835fda4d900365a0936d0263052baa
author Denis Egorenko <degorenko@mirantis.com> Mon Mar 18 18:11:19 2019 +0400
committer Denis Egorenko <degorenko@mirantis.com> Mon Mar 18 18:11:19 2019 +0400
tree c2f29c799127def761db4e2ce2635258dc849ab5
parent 2b5bd8f77b1e6254c5f7781e2962ee3278744835

Use cloud-user name if specified for generation config-drive

Change-Id: Id884d8be49024bd809fdea58eb2e6196071fd7eb
Related-Prod: PROD-28144 (PROD:28144)

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index c407d7c..ac6b918 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -242,7 +242,10 @@
                     if (outdateGeneration) {
                         args.add('--ssh-key failsafe-ssh-key.pub')
                     } else {
-                        args.add('--ssh-keys failsafe-ssh-key.pub')
+                        if (context.get('cfg_failsafe_user')) {
+                            args.add('--ssh-keys failsafe-ssh-key.pub')
+                            args.add("--cloud-user-name ${context.get('cfg_failsafe_user')}")
+                        }
                     }
                 }
                 // load data from model