Update generateModel for new model structure
* Depends-on: https://gerrit.mcp.mirantis.com/#/c/36179/
Change-Id: I6f685d49fa7eb47bb67617bc5d2d3b2443621e31
Prod-related: PROD-26374(PROD:26374)
diff --git a/src/com/mirantis/mk/Python.groovy b/src/com/mirantis/mk/Python.groovy
index 6a054bb..3929043 100644
--- a/src/com/mirantis/mk/Python.groovy
+++ b/src/com/mirantis/mk/Python.groovy
@@ -295,27 +295,11 @@
common.warningMsg('Generating models using context:\n')
print(context)
withEnv(["CONFIG_FILE=$tempContextFile",
- "OUTPUT_DIR=${generatedModel}/classes/cluster/",
+ "OUTPUT_DIR=${modelEnv}",
]) {
print('[Cookiecutter build] Result:\n' +
sh(returnStdout: true, script: 'tox -ve generate_auto'))
}
- // dropme after impelementation new format
- sh "mkdir -p ${generatedModel}/nodes/"
- def nodeFile = "${generatedModel}/nodes/${saltMasterName}.${clusterDomain}.yml"
- def nodeString = """classes:
-- cluster.${clusterName}.infra.config
-parameters:
- _param:
- linux_system_codename: xenial
- reclass_data_revision: master
- linux:
- system:
- name: ${saltMasterName}
- domain: ${clusterDomain}
- """
- writeFile(file: nodeFile, text: nodeString)
- //
} else {
common.warningMsg("Old format: Generating model from context ${contextName}")
def productList = ["infra", "cicd", "kdt", "opencontrail", "kubernetes", "openstack", "oss", "stacklight", "ceph"]