Add resources for cfg bm
When encrypted set to true, cfg node dies with current resources,
so add mem and vcpu to cfg node, as in any time we have only
1 cfg node runnng on this slave
Change-Id: Ia103ab5d4945ba2da6d28f9b337d21dda27d42f2
diff --git a/src/com/mirantis/system_qa/SharedPipeline.groovy b/src/com/mirantis/system_qa/SharedPipeline.groovy
index ad52129..d50432f 100644
--- a/src/com/mirantis/system_qa/SharedPipeline.groovy
+++ b/src/com/mirantis/system_qa/SharedPipeline.groovy
@@ -171,6 +171,7 @@
def environment_template_ref_change = env.ENVIRONMENT_TEMPLATE_REF_CHANGE ?: ''
def mcp_salt_repo_url = env.MCP_SALT_REPO_URL ?: ''
def mcp_salt_repo_key = env.MCP_SALT_REPO_KEY ?: ''
+ def deploy_network_mask = env.DEPLOY_NETWORK_NETMASK ?: ''
def env_ipmi_user = env.IPMI_USER ?: ''
def env_ipmi_pass = env.IPMI_PASS ?: ''
def env_lab_mgm_iface = env.LAB_MANAGEMENT_IFACE ?: ''
@@ -194,6 +195,7 @@
string(name: 'ENVIRONMENT_TEMPLATE_REF_CHANGE', value: "${environment_template_ref_change}"),
string(name: 'MCP_SALT_REPO_URL', value: "${mcp_salt_repo_url}"),
string(name: 'MCP_SALT_REPO_KEY', value: "${mcp_salt_repo_key}"),
+ string(name: 'DEPLOY_NETWORK_NETMASK', value: "${deploy_network_mask}"),
string(name: 'IPMI_USER', value: env_ipmi_user),
string(name: 'IPMI_PASS', value: env_ipmi_pass),
string(name: 'LAB_MANAGEMENT_IFACE', value: env_lab_mgm_iface),
@@ -367,6 +369,7 @@
def tcp_qa_refs = env.TCP_QA_REFS ?: ''
def mcp_salt_repo_url = env.MCP_SALT_REPO_URL ?: ''
def mcp_salt_repo_key = env.MCP_SALT_REPO_KEY ?: ''
+ def deploy_network_mask = env.DEPLOY_NETWORK_NETMASK ?: ''
def parameters = [
string(name: 'CLUSTER_NAME', value: "${LAB_CONFIG_NAME}"),
@@ -383,6 +386,7 @@
booleanParam(name: 'PIPELINES_FROM_ISO', value: true),
string(name: 'MCP_SALT_REPO_URL', value: "${mcp_salt_repo_url}"),
string(name: 'MCP_SALT_REPO_KEY', value: "${mcp_salt_repo_key}"),
+ string(name: 'DEPLOY_NETWORK_NETMASK', value: "${deploy_network_mask}"),
string(name: 'PIPELINE_LIBRARY_REF', value: "${pipeline_library_ref}"),
string(name: 'MK_PIPELINES_REF', value: "${mk_pipelines_ref}"),
string(name: 'TCP_QA_REFS', value: "${tcp_qa_refs}"),
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.yaml
index 9cd8de7..9ed29bc 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.yaml
@@ -95,8 +95,8 @@
- name: {{ HOSTNAME_CFG01 }}
role: salt_master
params:
- vcpu: !os_env SLAVE_NODE_CPU, 4
- memory: !os_env SLAVE_NODE_MEMORY, 12288
+ vcpu: !os_env SLAVE_NODE_CPU, 8
+ memory: !os_env SLAVE_NODE_MEMORY, 20480
boot:
- hd
volumes: