commit ffff3301524862e313417ac903340e8a5f49010f
author Ivan Berezovskiy <iberezovskiy@mirantis.com> Fri Sep 21 19:02:39 2018 +0400
committer Ivan Berezovskiy <iberezovskiy@mirantis.com> Mon Oct 08 12:41:53 2018 +0400
tree a2f16aa881a79b0394d787979ef6cd9cf30d5202
parent 1437742b61ab448f775e9b96a81a37eaca8e3fc8

Operate with YAML files instead of sh for user-data for apt node

Change-Id: I60a930073ee1ba26ea3fa0379ad10f04961d3304
Related-task: #PROD-23344 (PROD:23344)

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 5e31d36..6347808 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -256,7 +256,7 @@
 
                 if (templateContext['default_context']['local_repositories'] == 'True') {
                     def aptlyServerHostname = templateContext.default_context.aptly_server_hostname
-                    sh "cp mcp-common-scripts/config-drive/mirror_config.sh mirror_config.sh"
+                    sh "[ -f mcp-common-scripts/config-drive/mirror_config.yaml ] && cp mcp-common-scripts/config-drive/mirror_config.yaml mirror_config || cp mcp-common-scripts/config-drive/mirror_config.sh mirror_config"
 
                     def smc_apt = [:]
                     smc_apt['SALT_MASTER_DEPLOY_IP'] = templateContext['default_context']['salt_master_management_address']
@@ -265,11 +265,11 @@
                     smc_apt['APTLY_MINION_ID'] = "${aptlyServerHostname}.${clusterDomain}"
 
                     for (i in common.entries(smc_apt)) {
-                        sh "sed -i \"s,export ${i[0]}=.*,export ${i[0]}=${i[1]},\" mirror_config.sh"
+                        sh "sed -i \"s,export ${i[0]}=.*,export ${i[0]}=${i[1]},\" mirror_config"
                     }
 
                     // create apt config-drive
-                    sh "./create-config-drive --user-data mirror_config.sh --hostname ${aptlyServerHostname} ${aptlyServerHostname}.${clusterDomain}-config.iso"
+                    sh "./create-config-drive --user-data mirror_config --hostname ${aptlyServerHostname} ${aptlyServerHostname}.${clusterDomain}-config.iso"
                     sh("mv ${aptlyServerHostname}.${clusterDomain}-config.iso output-${clusterName}/")
 
                     // save apt iso to artifacts