openstack
/
heat
Code Issues Proposed changes

Set 'ZAQAR_MESSAGE', 'ZAQAR_SIGNAL' as a default config option 

Now we support 'ZAQAR_MESSAGE' as software_config_transport for nova
server resource, and support 'ZAQAR_SIGNAL' as signal_transport for
software deployment resource, but they are not the choices options in
config.py.

Change-Id: I574b0dad972f5f6d9e2cf1abf4b8fd81a8b9d8b9
Closes-Bug: #1496765
This commit is contained in:
huangtianhua 2015-09-18 09:56:59 +08:00
parent a8ae73b35e
commit 59ea1f2d8f
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
heat/common/config.py
View File

@ -158,7 +158,8 @@ engine_opts = [
cfg.StrOpt('default_software_config_transport',
choices=['POLL_SERVER_CFN',
'POLL_SERVER_HEAT',
'POLL_TEMP_URL'],
'POLL_TEMP_URL',
'ZAQAR_MESSAGE'],
default='POLL_SERVER_CFN',
help=_('Template default for how the server should receive the '
'metadata required for software configuration. '
@ -171,11 +172,14 @@ engine_opts = [
'stack_user_* config options). '
'POLL_TEMP_URL will create and populate a '
'Swift TempURL with metadata for polling (requires '
'object-store endpoint which supports TempURL).')),
'object-store endpoint which supports TempURL).'
'ZAQAR_MESSAGE will create a dedicated zaqar queue and '
'post the metadata for polling.')),
cfg.StrOpt('default_deployment_signal_transport',
choices=['CFN_SIGNAL',
'TEMP_URL_SIGNAL',
'HEAT_SIGNAL'],
'HEAT_SIGNAL',
'ZAQAR_SIGNAL'],
default='CFN_SIGNAL',
help=_('Template default for how the server should signal to '
'heat with the deployment output values. CFN_SIGNAL '
@ -186,7 +190,9 @@ engine_opts = [
'which supports TempURL). '
'HEAT_SIGNAL will allow calls to the Heat API '
'resource-signal using the provided keystone '
'credentials')),
'credentials. ZAQAR_SIGNAL will create a dedicated '
'zaqar queue to be signaled using the provided keystone '
'credentials.')),
cfg.ListOpt('hidden_stack_tags',
default=[],
help=_('Stacks containing these tag names will be hidden. '

2
heat/engine/resources/openstack/heat/software_deployment.py
View File

@ -156,7 +156,7 @@ class SoftwareDeployment(signal_responder.SignalResponder):
'keypair signed URL. TEMP_URL_SIGNAL will create a '
'Swift TempURL to be signaled via HTTP PUT. HEAT_SIGNAL '
'will allow calls to the Heat API resource-signal using the '
'provided keystone credentials. ZAQAR_SIGNAL will create a'
'provided keystone credentials. ZAQAR_SIGNAL will create a '
'dedicated zaqar queue to be signaled using the provided '
'keystone credentials. NO_SIGNAL will result in the resource '
'going to the COMPLETE state without waiting for any signal.'),

4
heat/engine/resources/openstack/nova/server.py
View File

@ -412,7 +412,9 @@ class Server(stack_user.StackUser, sh.SchedulerHintsMixin,
'the provided keypair. POLL_SERVER_HEAT will allow calls to '
'the Heat API resource-show using the provided keystone '
'credentials. POLL_TEMP_URL will create and populate a '
'Swift TempURL with metadata for polling.'),
'Swift TempURL with metadata for polling. ZAQAR_MESSAGE will '
'create a dedicated zaqar queue and post the metadata '
'for polling.'),
default=cfg.CONF.default_software_config_transport,
constraints=[
constraints.AllowedValues(_SOFTWARE_CONFIG_TRANSPORTS),