PROD-35900 Conditional deployment of the empty node
Change-Id: If8dec13efbb862d14f6d8ff0108ee18b9795234e
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt.yaml
index d4eeaac..2a94e69 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt.yaml
@@ -13,5 +13,6 @@
{{ SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES() }}
{{ SHARED.MACRO_IPFLUSH_TENANTS_IFACES() }}
+{{SHARED.DISABLE_EMPTY_NODE()}}
{{ SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS() }}
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay.hot b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay.hot
index 5ecf130..88997d7 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay.hot
@@ -39,6 +39,9 @@
salt_master_control_ip:
type: string
default: 10.6.0.15
+ deploy_empty_node:
+ type: boolean
+ default: False
key_pair:
type: string
@@ -1065,6 +1068,35 @@
instance_config_host: { get_attr: [cfg01_node, instance_address] }
+ empty_node:
+ type: MCP::SingleInstance2Volumes
+ depends_on: [cfg01_node]
+ condition: { get_param: deploy_empty_node }
+ properties:
+ env_name: { get_param: env_name }
+ mcp_version: { get_param: mcp_version }
+ instance_domain: {get_param: instance_domain}
+ instance_name: xtra
+ role: none
+ instance_flavor: {get_param: osd_flavor}
+ availability_zone: { get_param: vm_availability_zone }
+ underlay_userdata: { get_file: ./underlay-userdata.yaml }
+ control_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [subnets, control_net_prefix] }, '205' ]
+ tenant_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [subnets, tenant_net_prefix] }, '205' ]
+ external_net_static_ip:
+ list_join:
+ - '.'
+ - [ { get_attr: [subnets, external_net_prefix] }, '205' ]
+
+ instance_config_host: { get_attr: [cfg01_node, instance_address] }
+
+
outputs:
foundation_public_ip:
description: foundation node IP address (floating) from external network