Use deploy_network_netmask for 2018.4.0 version as deploy network mask
Change-Id: Ic9b364142d9d02f57bf9d54382d596b3027af938
Related-Prod: PROD-29112 (PROD:29112)
Bug-related: PROD-29216 (PROD:29216)
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index f24f7f8..99ee3ea 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -296,8 +296,15 @@
}
// calculate netmask
- def subnet = new SubnetUtils(context['deploy_network_subnet'])
- def deployNetworkSubnet = subnet.getInfo().getNetmask()
+ def deployNetworkSubnet = ''
+ if (context.get('deploy_network_subnet')) {
+ def subnet = new SubnetUtils(context['deploy_network_subnet'])
+ deployNetworkSubnet = subnet.getInfo().getNetmask()
+ } else if (context.get('deploy_network_netmask')) { // case for 2018.4.0
+ deployNetworkSubnet = context['deploy_network_netmask']
+ } else {
+ error('Neither context parameter deploy_network_subnet or deploy_network_netmask should be set!')
+ }
// create cfg config-drive
if (outdateGeneration) {
args += ["--hostname ${context['salt_master_hostname']}", "${context['salt_master_hostname']}.${context['cluster_domain']}-config.iso"]