Can't set 'ZAQAR_MESSAGE' and 'ZAQAR_SIGNAL' as default config option

[huangtianhua]

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:

cfg.StrOpt('default_software_config_transport',
               choices=['POLL_SERVER_CFN',
                        'POLL_SERVER_HEAT',
                        'POLL_TEMP_URL'],

cfg.StrOpt('default_deployment_signal_transport',
               choices=['CFN_SIGNAL',
                        'TEMP_URL_SIGNAL',
                        'HEAT_SIGNAL'],

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/224957

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/224957
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=59ea1f2d8f0404a4a811dd06d5e20cfb2028c8d3
Submitter: Jenkins
Branch: master

commit 59ea1f2d8f0404a4a811dd06d5e20cfb2028c8d3
Author: huangtianhua <email address hidden>
Date: Fri Sep 18 09:56:59 2015 +0800

    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