openstack/deb-heat
Code Issues Proposed changes

Merge "Provide the necessary inputs to enable HEAT_SIGNAL"

Browse Source
This commit is contained in:
Jenkins 2014-03-24 05:23:00 +00:00 committed by Gerrit Code Review
commit 01cea95e29
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
heat/engine/resources/software_config/software_deployment.py
View File

@ -59,13 +59,13 @@ class SoftwareDeployment(signal_responder.SignalResponder):
DEPLOY_SIGNAL_ID, DEPLOY_STACK_ID,
DEPLOY_RESOURCE_NAME, DEPLOY_AUTH_URL,
DEPLOY_USERNAME, DEPLOY_PASSWORD,
DEPLOY_PROJECT_ID,
DEPLOY_PROJECT_ID, DEPLOY_USER_ID
) = (
'deploy_server_id', 'deploy_action',
'deploy_signal_id', 'deploy_stack_id',
'deploy_resource_name', 'deploy_auth_url',
'deploy_username', 'deploy_password',
'deploy_project_id'
'deploy_project_id', 'deploy_user_id'
)
SIGNAL_TRANSPORTS = (
@ -261,7 +261,7 @@ class SoftwareDeployment(signal_responder.SignalResponder):
scl.NAME: self.DEPLOY_STACK_ID,
scl.DESCRIPTION: _('ID of the stack this deployment belongs to'),
scl.TYPE: 'String',
'value': self.stack.identifier().stack_id
'value': self.stack.identifier().stack_path()
}, {
scl.NAME: self.DEPLOY_RESOURCE_NAME,
scl.DESCRIPTION: _('Name of this deployment resource in the '
@ -282,12 +282,17 @@ class SoftwareDeployment(signal_responder.SignalResponder):
scl.NAME: self.DEPLOY_AUTH_URL,
scl.DESCRIPTION: _('URL for API authentication'),
scl.TYPE: 'String',
'value': self.context.auth_url
'value': self.keystone().v3_endpoint
}, {
scl.NAME: self.DEPLOY_USERNAME,
scl.DESCRIPTION: _('Username for API authentication'),
scl.TYPE: 'String',
'value': self.physical_resource_name(),
}, {
scl.NAME: self.DEPLOY_USER_ID,
scl.DESCRIPTION: _('User ID for API authentication'),
scl.TYPE: 'String',
'value': self._get_user_id(),
}, {
scl.NAME: self.DEPLOY_PASSWORD,
scl.DESCRIPTION: _('Password for API authentication'),

3
heat/tests/test_software_deployment.py
View File

@ -173,7 +173,8 @@ class SoftwareDeploymentTest(HeatTestCase):
'description': 'ID of the stack this deployment belongs to',
'name': 'deploy_stack_id',
'type': 'String',
'value': '42f6f66b-631a-44e7-8d01-e22fb54574a9'
'value': ('software_deployment_test_stack'
'/42f6f66b-631a-44e7-8d01-e22fb54574a9')
}, {
'description': 'Name of this deployment resource in the stack',
'name': 'deploy_resource_name',