remove unused config options

There are several historical cut/paste unused options, which have
also now found there way into heat.conf.sample, which will confuse
users, so best to remove them.

Fixes bug #1215834

Change-Id: I0fe4717327fc67fe109bef4ba1758d2f18e84520

diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample
index 46fd9571432c4b51217c5e7ca463408823e63169..59a39a9cb8d9fd8191057ac659cc6e2053f62615 100644 (file)
--- a/etc/heat/heat.conf.sample
+++ b/etc/heat/heat.conf.sample
@@ -29,31 +29,9 @@
 # value)
 #host=heat
 
-# seconds between nodes reporting state to datastore (integer
-# value)
-#report_interval=10
-
 # seconds between running periodic tasks (integer value)
 #periodic_interval=60
 
-# IP address for EC2 API to listen (string value)
-#ec2_listen=0.0.0.0
-
-# port for ec2 api to listen (integer value)
-#ec2_listen_port=8773
-
-# IP address for OpenStack API to listen (string value)
-#osapi_compute_listen=0.0.0.0
-
-# list port for osapi compute (integer value)
-#osapi_compute_listen_port=8774
-
-# IP address for OpenStack Volume API to listen (string value)
-#osapi_volume_listen=0.0.0.0
-
-# port for os volume api to listen (integer value)
-#osapi_volume_listen_port=8776
-
 # URL of the Heat metadata server (string value)
 #heat_metadata_server_url=
 

diff --git a/heat/common/config.py b/heat/common/config.py
index e72aa224d05c8cb3630082823f931b0f46820ee8..32aa4cc36f04390d6f11523efdea23544cd0536a 100644 (file)
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -40,30 +40,9 @@ paste_deploy_opts = [
 
 
 service_opts = [
-    cfg.IntOpt('report_interval',
-               default=10,
-               help='seconds between nodes reporting state to datastore'),
     cfg.IntOpt('periodic_interval',
                default=60,
                help='seconds between running periodic tasks'),
-    cfg.StrOpt('ec2_listen',
-               default="0.0.0.0",
-               help='IP address for EC2 API to listen'),
-    cfg.IntOpt('ec2_listen_port',
-               default=8773,
-               help='port for ec2 api to listen'),
-    cfg.StrOpt('osapi_compute_listen',
-               default="0.0.0.0",
-               help='IP address for OpenStack API to listen'),
-    cfg.IntOpt('osapi_compute_listen_port',
-               default=8774,
-               help='list port for osapi compute'),
-    cfg.StrOpt('osapi_volume_listen',
-               default="0.0.0.0",
-               help='IP address for OpenStack Volume API to listen'),
-    cfg.IntOpt('osapi_volume_listen_port',
-               default=8776,
-               help='port for os volume api to listen'),
     cfg.StrOpt('heat_metadata_server_url',
                default="",
                help='URL of the Heat metadata server'),