heat engine : add heat_waitcondition_server_url

Add config option for waitcondition server, since metadata
and waitcondition notifications are no longer handled by the
same API

Change-Id: Idc1b39c6c60b8473316fe4861f0f060568540b09
Signed-off-by: Steven Hardy <shardy@redhat.com>

diff --git a/docs/GettingStarted.rst b/docs/GettingStarted.rst
index 4fb45d0e1a15f641895631f3a518bf2b335eb042..5dde28ef90aaf6f86a9d9846d1394ac8dab9a822 100644 (file)
--- a/docs/GettingStarted.rst
+++ b/docs/GettingStarted.rst
@@ -193,6 +193,7 @@ The heat engine configuration file should be updated with the address of the bri
 
 ::
     sudo sed -i -e "/heat_metadata_server_url/ s/127\.0\.0\.1/${BRIDGE_IP}/" /etc/heat/heat-engine.conf
+    sudo sed -i -e "/heat_waitcondition_server_url/ s/127\.0\.0\.1/${BRIDGE_IP}/" /etc/heat/heat-engine.conf
 
 Launch the Heat services
 ------------------------

diff --git a/etc/heat/heat-engine.conf b/etc/heat/heat-engine.conf
index f7c2405cd91781fc1966592ef5d1e961f241a9d5..462835bedfc9d6592049f1c06d80d6a56d5e950c 100644 (file)
--- a/etc/heat/heat-engine.conf
+++ b/etc/heat/heat-engine.conf
@@ -21,6 +21,14 @@ heat_stack_user_role = heat_stack_user
 # NOTE : change this from 127.0.0.1 !!
 heat_metadata_server_url = http://127.0.0.1:8000
 
+# URL for instances to connect for notification
+# of waitcondition events (ie via cfn-signal)
+# e.g the IP of the bridge device connecting the
+# instances with the host and the bind_port of
+# the heat-metadata API
+# NOTE : change this from 127.0.0.1 !!
+heat_waitcondition_server_url = http://127.0.0.1:8002
+
 # Log to this file. Make sure the user running heat-api has
 # permissions to write to this file!
 log_file = /var/log/heat/engine.log

diff --git a/heat/common/config.py b/heat/common/config.py
index 4af919c64103400d748184f5761429ffc13f7bea..abd0c04a26f413902ba12738459f9b42cd612bce 100644 (file)
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -80,6 +80,9 @@ cfg.IntOpt('osapi_volume_listen_port',
 cfg.StrOpt('heat_metadata_server_url',
            default="",
            help='URL of the Heat metadata server'),
+cfg.StrOpt('heat_waitcondition_server_url',
+           default="",
+           help='URL of the Heat waitcondition server'),
 cfg.StrOpt('heat_stack_user_role',
            default="heat_stack_user",
            help='Keystone role for heat template-defined users'),

diff --git a/heat/engine/resources/wait_condition.py b/heat/engine/resources/wait_condition.py
index 66eba75f8fcacf48043c7e8a64418cfe2fc26371..20073ddc7bd5602ea8fe8bdbc68bed22ef5f02d1 100644 (file)
--- a/heat/engine/resources/wait_condition.py
+++ b/heat/engine/resources/wait_condition.py
@@ -40,7 +40,7 @@ class WaitConditionHandle(resource.Resource):
 
     def handle_create(self):
         self.instance_id = '%s/stacks/%s/resources/%s' % \
-                           (cfg.CONF.heat_metadata_server_url,
+                           (cfg.CONF.heat_waitcondition_server_url,
                             self.stack.id,
                             self.name)