openstack
/
heat
Code Issues Proposed changes

Fix multi region issue for software deployment 

Except commit Iec6f3606c9fdf8474f393b0990356f34d38bcf75 we still
need this one to make sure the region name can be populated as
deployment metadata.

Task: 22854
Story: 2002781

Depends-On: I88182a9a9af74e9760b2ec9b500971f06293f0b8

Change-Id: Id87935bdb1484e66f6066361d80e245d08d9ab66
This commit is contained in:
Feilong Wang 2018-07-06 06:51:56 +12:00
parent ab55acf43b
commit 73d5b2cabe
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat/engine/resources/server_base.py
View File

@ -67,6 +67,8 @@ class BaseServer(stack_user.StackUser):
occ = meta['os-collect-config']
collectors = list(self.default_collectors)
occ['collectors'] = collectors
region_name = (self.context.region_name or
cfg.CONF.region_name_for_services)
# set existing values to None to override any boot-time config
occ_keys = ('heat', 'zaqar', 'cfn', 'request')
@ -85,7 +87,8 @@ class BaseServer(stack_user.StackUser):
'auth_url': self.context.auth_url,
'project_id': self.stack.stack_user_project_id,
'stack_id': self.stack.identifier().stack_path(),
'resource_name': self.name}})
'resource_name': self.name,
'region_name': region_name}})
collectors.append('heat')
elif self.transport_zaqar_message(props):
@ -95,7 +98,8 @@ class BaseServer(stack_user.StackUser):
'password': self.password,
'auth_url': self.context.auth_url,
'project_id': self.stack.stack_user_project_id,
'queue_id': queue_id}})
'queue_id': queue_id,
'region_name': region_name}})
collectors.append('zaqar')
elif self.transport_poll_server_cfn(props):

7
heat/tests/openstack/heat/test_deployed_server.py
View File

@ -136,7 +136,8 @@ class DeployedServersTest(common.HeatTestCase):
def _setup_test_stack(self, stack_name, test_templ=ds_tmpl):
t = template_format.parse(test_templ)
tmpl = template.Template(t, env=environment.Environment())
stack = parser.Stack(utils.dummy_context(), stack_name, tmpl,
stack = parser.Stack(utils.dummy_context(region_name="RegionOne"),
stack_name, tmpl,
stack_id=uuidutils.generate_uuid(),
stack_user_project_id='8888')
return (tmpl, stack)
@ -476,6 +477,7 @@ class DeployedServersTest(common.HeatTestCase):
'auth_url': 'http://server.test:5000/v2.0',
'password': server.password,
'project_id': '8888',
'region_name': 'RegionOne',
'resource_name': 'server',
'stack_id': 'server_heat_s/%s' % stack.id,
'user_id': '1234'
@ -507,6 +509,7 @@ class DeployedServersTest(common.HeatTestCase):
'auth_url': 'http://server.test:5000/v2.0',
'password': server.password,
'project_id': '8888',
'region_name': 'RegionOne',
'resource_name': 'server',
'stack_id': 'server_heat_s/%s' % stack.id,
'user_id': '1234'
@ -566,6 +569,7 @@ class DeployedServersTest(common.HeatTestCase):
'password': server.password,
'auth_url': 'http://server.test:5000/v2.0',
'project_id': '8888',
'region_name': 'RegionOne',
'queue_id': queue_id
},
'collectors': ['zaqar', 'local']
@ -583,6 +587,7 @@ class DeployedServersTest(common.HeatTestCase):
'password': server.password,
'auth_url': 'http://server.test:5000/v2.0',
'project_id': '8888',
'region_name': 'RegionOne',
'queue_id': queue_id
},
'collectors': ['zaqar', 'local'],

21
heat/tests/openstack/nova/test_server.py
View File

@ -277,7 +277,8 @@ class ServersTest(common.HeatTestCase):
env=environment.Environment(
{'key_name': 'test'}),
files=files)
stack = parser.Stack(utils.dummy_context(), stack_name, templ,
stack = parser.Stack(utils.dummy_context(region_name="RegionOne"),
stack_name, templ,
stack_id=uuidutils.generate_uuid(),
stack_user_project_id='8888')
return templ, stack
@ -917,6 +918,7 @@ class ServersTest(common.HeatTestCase):
'auth_url': 'http://server.test:5000/v2.0',
'password': server.password,
'project_id': '8888',
'region_name': 'RegionOne',
'resource_name': 'WebServer',
'stack_id': 'software_config_s/%s' % stack.id,
'user_id': '1234'
@ -936,6 +938,7 @@ class ServersTest(common.HeatTestCase):
'auth_url': 'http://server.test:5000/v2.0',
'password': server.password,
'project_id': '8888',
'region_name': 'RegionOne',
'resource_name': 'WebServer',
'stack_id': 'software_config_s/%s' % stack.id,
'user_id': '1234'
@ -1087,7 +1090,8 @@ class ServersTest(common.HeatTestCase):
'password': server.password,
'auth_url': 'http://server.test:5000/v2.0',
'project_id': '8888',
'queue_id': queue_id
'queue_id': queue_id,
'region_name': 'RegionOne',
},
'collectors': ['ec2', 'zaqar', 'local']
},
@ -1108,7 +1112,8 @@ class ServersTest(common.HeatTestCase):
'password': server.password,
'auth_url': 'http://server.test:5000/v2.0',
'project_id': '8888',
'queue_id': mock.ANY
'queue_id': mock.ANY,
'region_name': 'RegionOne',
},
'collectors': ['ec2', 'zaqar', 'local']
},
@ -1128,7 +1133,8 @@ class ServersTest(common.HeatTestCase):
'password': server.password,
'auth_url': 'http://server.test:5000/v2.0',
'project_id': '8888',
'queue_id': queue_id
'queue_id': queue_id,
'region_name': 'RegionOne',
},
'collectors': ['ec2', 'zaqar', 'local'],
'polling_interval': 10
@ -1794,7 +1800,7 @@ class ServersTest(common.HeatTestCase):
'metadata_url': None,
'path': None,
'secret_access_key': None,
'stack_name': None
'stack_name': None,
},
'request': {
'metadata_url': 'the_url',
@ -1815,6 +1821,7 @@ class ServersTest(common.HeatTestCase):
'auth_url': 'http://server.test:5000/v2.0',
'password': password,
'project_id': '8888',
'region_name': 'RegionOne',
'resource_name': 'WebServer',
'stack_id': 'software_config_s/%s' % stack.id,
'user_id': '1234'
@ -1847,12 +1854,14 @@ class ServersTest(common.HeatTestCase):
'password': password_1,
'auth_url': 'http://server.test:5000/v2.0',
'project_id': '8888',
'queue_id': server.data().get('metadata_queue_id')
'queue_id': server.data().get('metadata_queue_id'),
'region_name': 'RegionOne',
},
'heat': {
'auth_url': None,
'password': None,
'project_id': None,
'region_name': None,
'resource_name': None,
'stack_id': None,
'user_id': None