Change the default port references to DEFAULT_PORT

If we need to change it again then this will make it easier.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/bin/heat-api b/bin/heat-api
index f0e6900fb9e9332ccee6b874042fca2737e3a439..26016f44adf2d7f61311b0490069b6b9a70729a3 100755 (executable)
--- a/bin/heat-api
+++ b/bin/heat-api
@@ -48,7 +48,7 @@ if __name__ == '__main__':
         app = config.load_paste_app(conf)
 
         server = wsgi.Server()
-        server.start(app, conf, default_port=9292)
+        server.start(app, conf, default_port=DEFAULT_PORT)
         server.wait()
     except RuntimeError, e:
         sys.exit("ERROR: %s" % e)

diff --git a/heat/common/cfg.py b/heat/common/cfg.py
index 258776d4523fe9c43b0e7bf76bbd4d5646439d0d..9f64f9e11b5b6473d27be783f6b9d1a68149d712 100644 (file)
--- a/heat/common/cfg.py
+++ b/heat/common/cfg.py
@@ -24,7 +24,7 @@ The schema for each option is defined using the Opt sub-classes e.g.
                    default='0.0.0.0',
                    help='IP address to listen on'),
         cfg.IntOpt('bind_port',
-                   default=9292,
+                   default=DEFAULT_PORT,
                    help='Port number to listen on')
     ]
 
@@ -103,14 +103,14 @@ The config manager has a single CLI option defined by default, --config-file:
             self.register_cli_opt(self.config_file_opt)
 
 Option values are parsed from any supplied config files using SafeConfigParser.
-If none are specified, a default set is used e.g. glance-api.conf and
-glance-common.conf:
+If none are specified, a default set is used e.g. heat-api.conf and
+heat-common.conf:
 
-    glance-api.conf:
+    heat-api.conf:
       [DEFAULT]
-      bind_port = 9292
+      bind_port = 8000
 
-    glance-common.conf:
+    heat-common.conf:
       [DEFAULT]
       bind_host = 0.0.0.0
 
@@ -156,9 +156,9 @@ Options can be registered as belonging to a group:
 If no group is specified, options belong to the 'DEFAULT' section of config
 files:
 
-    glance-api.conf:
+    heat-api.conf:
       [DEFAULT]
-      bind_port = 9292
+      bind_port = 8000
       ...
 
       [rabbit]