From 0ba94dcc7a2d6fac0579331beb0e6ca267ee8c81 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Thu, 25 Oct 2012 14:50:28 +0100 Subject: [PATCH] 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 --- docs/GettingStarted.rst | 1 + etc/heat/heat-engine.conf | 8 ++++++++ heat/common/config.py | 3 +++ heat/engine/resources/wait_condition.py | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/GettingStarted.rst b/docs/GettingStarted.rst index 4fb45d0e..5dde28ef 100644 --- 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 f7c2405c..462835be 100644 --- 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 4af919c6..abd0c04a 100644 --- 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 66eba75f..20073ddc 100644 --- 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) -- 2.45.2