commit 8ae761a3a78ecc04b1181cdf92fe73634122dcb6
author Tatyanka Leontovich <tleontovich@mirantis.com> Wed Apr 03 09:54:56 2019 +0000
committer Gerrit Code Review <support@gerrithub.io> Wed Apr 03 09:54:56 2019 +0000
tree 7972b2c1e6a1a98db268113f3525ad7251abacbc
parent ae1277da5eeb0e0aedeb2c3643352cb076f0b565
parent 1f069160fb54eac78b76f2b8f686512f7b4ec85d

Merge "Add resources for cfg bm"

src/com/mirantis/system_qa/SharedPipeline.groovy

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}"),

tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.yaml

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: