From 81c0b75bf95de6650441502d680d0be2407bcacb Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 10 May 2022 16:20:45 +0900
Subject: [PATCH] Remove ineffective parameter from standalone/ephemeral
 heat.conf

The [DEFAULT] rpc_poll_timeout parameter was used by ZeroMQ driver
which was already removed [1].

[1] f2fd8d437589d94443a137c7ca7a38d6b782d153

Change-Id: I5a0dccdecb3c189f6364a9209e58672b47c370bb
---
 templates/ephemeral-heat/heat.conf.j2 | 1 -
 tripleoclient/heat_launcher.py        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/templates/ephemeral-heat/heat.conf.j2 b/templates/ephemeral-heat/heat.conf.j2
index 9d5688206..6baa2f373 100644
--- a/templates/ephemeral-heat/heat.conf.j2
+++ b/templates/ephemeral-heat/heat.conf.j2
@@ -11,7 +11,6 @@ max_json_body_size = 8388608
 max_nested_stack_depth = 10
 max_resources_per_stack=-1
 num_engine_workers = {{ num_engine_workers }}
-rpc_poll_timeout = 60
 rpc_response_timeout = 600
 transport_url={{ transport_url }}
 
diff --git a/tripleoclient/heat_launcher.py b/tripleoclient/heat_launcher.py
index de8ca7c79..c1ef17a35 100644
--- a/tripleoclient/heat_launcher.py
+++ b/tripleoclient/heat_launcher.py
@@ -235,7 +235,6 @@ class HeatBaseLauncher(object):
 [DEFAULT]
 log_file = %(log_file)s
 transport_url = 'fake://'
-rpc_poll_timeout = 60
 rpc_response_timeout = 600
 deferred_auth_method = password
 num_engine_workers=1