Change role to use only name part in attributes
The resource name in the master template no longer requires the name+version+"-servers" suffix. Change-Id: I991a9720d0beadbcd29a5266a40c9033df0466b0
This commit is contained in:
parent
9fe1c3a893
commit
aa754741a3
|
@ -189,7 +189,7 @@ class PlansManager(object):
|
||||||
template_seed.update_role_resource_references(
|
template_seed.update_role_resource_references(
|
||||||
deployment_plan.master_template,
|
deployment_plan.master_template,
|
||||||
seed_role,
|
seed_role,
|
||||||
plan.generate_group_id(role_namespace))
|
db_role.name)
|
||||||
|
|
||||||
template_seed.update_role_property_references(
|
template_seed.update_role_property_references(
|
||||||
deployment_plan.master_template,
|
deployment_plan.master_template,
|
||||||
|
|
|
@ -210,7 +210,7 @@ class PlansManagerTestCase(TestCase):
|
||||||
self.assertIsNot(config_property, None)
|
self.assertIsNot(config_property, None)
|
||||||
self.assertEqual(config_property.value,
|
self.assertEqual(config_property.value,
|
||||||
{'ip_addresses':
|
{'ip_addresses':
|
||||||
{'get_attr': ['r1-1-servers', 'foo_ip']}})
|
{'get_attr': ['r1', 'foo_ip']}})
|
||||||
|
|
||||||
# verify both entries are present from RESOURCE_REGISTRY
|
# verify both entries are present from RESOURCE_REGISTRY
|
||||||
parsed_env = parser.parse_environment(
|
parsed_env = parser.parse_environment(
|
||||||
|
|
Loading…
Reference in New Issue