Add customization in maintenance branch
PROD-27329

Change-Id: I55b06df674309ad501e2abd9585d8e428077eb8e
diff --git a/tempest/tempest_ext.conf b/tempest/tempest_ext.conf
index a49030f..525faee 100644
--- a/tempest/tempest_ext.conf
+++ b/tempest/tempest_ext.conf
@@ -6,12 +6,8 @@
 min_microversion = 2.1
 max_microversion = latest
 volume_device_name = vdc
-min_compute_nodes = 3
+min_compute_nodes = 2
 endpoint_type = publicURL
-ping_timeout = 20
-ping_count = 5
-ssh_timeout = 90
-ssh_channel_timeout = 100
 build_timeout = 120
 fixed_network_name = ${FIXED_NET}
 
@@ -20,27 +16,27 @@
 
 # please review and fill this section
 [heat_plugin]
-image_ref = ${IMAGE_REF2}
-username = admin
-project_name = admin
-admin_project_name = admin
-domain_name = default
-admin_username = admin
-admin_domain_name = default
+username = ${OS_USERNAME}
+admin_username = ${OS_USERNAME}
+admin_password = ${OS_PASSWORD}
+password = ${OS_PASSWORD}
+project_name = ${OS_TENANT_NAME}
+admin_project_name = ${OS_TENANT_NAME}
+region = ${OS_REGION_NAME}
+auth_version = 3
+auth_url = ${OS_AUTH_URL}
+project_domain_name = Default
+user_domain_name = Default
 endpoint_type = internal
-auth_url = http://10.0.0.0:5000/v2.0
-admin_password = aaa
-password = aaa
-disable_ssl_certificate_validation = True
-image_ref = ${IMAGE_REF2}
-minimal_image_ref = ${IMAGE_REF2}
 instance_type = m1.tiny
-network_for_ssh = net_name
-floating_network_name = net_name
-region = RegionOne
-fixed_network_name = ${FIXED_NET}
-fixed_subnet_name = subnet_name
 minimal_instance_type = m1.tiny
+network_for_ssh = ${PUBLIC_NET}
+floating_network_name = ${PUBLIC_NET}
+fixed_subnet_name = ${FIXED_SUBNET_NAME}
+disable_ssl_certificate_validation = True
+image_ref = ${IMAGE_NAME2}
+minimal_image_ref = ${IMAGE_NAME2}
+fixed_network_name = ${FIXED_NET}
 build_timeout = 180
 ssh_timeout = 30
 boot_config_env = /home/rally/boot_config_none_env.yaml
@@ -60,15 +56,19 @@
 [network]
 build_timeout = 120
 endpoint_type = publicURL
-public_network_id =
+# leave empty if you do not have fip net
+public_network_id = 
+# remove if you do not have fip net
+#floating_network_name = 
 
-[network_feature_enabled]
+[network-feature-enabled]
 port_security = true
 
 [validation]
-run_validation = False
+run_validation = false
 image_ssh_password = cubswin:)
 ssh_timeout = 130
+ping_timeout = 20
 
 [object-storage]
 container_sync_timeout = 120
@@ -78,11 +78,6 @@
 #for ceph
 discoverability = false
 
-[orchestration]
-max_template_size = 5440000
-max_resources_per_stack = 20000
-endpoint_type = publicURL
-
 [volume]
 max_microversion = latest
 build_timeout = 120
@@ -100,34 +95,3 @@
 api_v3 = true
 manage_snapshot = true
 backup = False
-
-[DEFAULT]
-lock_path = /tmp
-
-[dns]
-
-[heat_plugin]
-image_ref = <>
-username = admin
-project_name = admin
-admin_project_name = admin
-domain_name = default
-admin_username = admin
-admin_domain_name = default
-endpoint_type = internal
-auth_url = <>
-admin_password = <>
-password = <>
-disable_ssl_certificate_validation = True
-image_ref = <>
-minimal_image_ref = <>
-instance_type = <>
-network_for_ssh = <>
-floating_network_name = <>
-region = <>
-fixed_network_name = <>
-fixed_subnet_name = <>
-minimal_instance_type = <>
-build_timeout = 180
-ssh_timeout = 30
-boot_config_env = /home/rally/boot_config_none_env.yaml
\ No newline at end of file