diff options
author | Jiri Tomasek <jtomasek@redhat.com> | 2015-06-22 13:11:30 +0200 |
---|---|---|
committer | Jiri Tomasek <jtomasek@redhat.com> | 2015-06-22 13:11:34 +0200 |
commit | 2f0c129c45245aeb1f6ab142c32c373ecc8286c4 (patch) | |
tree | c7586792bc0c3f5028477fae9f27f8676007a9e5 | |
parent | ade568033e58a57519262f34c62893c364616f44 (diff) | |
download | tuskar-ui-2f0c129c45245aeb1f6ab142c32c373ecc8286c4.tar.gz |
Fix Nova Server Resources listing for Role in Stack
The Role resource group name now matches role name, so there is no
need to specify provider_resource_group_name property on Role
Change-Id: Ibccc3b65e63450feec894be7abc6551fc75b4ed4
-rw-r--r-- | tuskar_ui/api/heat.py | 2 | ||||
-rw-r--r-- | tuskar_ui/api/tuskar.py | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tuskar_ui/api/heat.py b/tuskar_ui/api/heat.py index 3d4c8eba..3054ad0d 100644 --- a/tuskar_ui/api/heat.py +++ b/tuskar_ui/api/heat.py @@ -236,7 +236,7 @@ class Stack(base.APIResourceWrapper): # A provider resource is deployed as a nested stack, so we have to # drill down and retrieve those that match a tuskar role for role in roles: - resource_group_name = role.provider_resource_group_name + resource_group_name = role.name try: resource_group = heat.resource_get(self._request, self.id, diff --git a/tuskar_ui/api/tuskar.py b/tuskar_ui/api/tuskar.py index 6018b942..6dd1785e 100644 --- a/tuskar_ui/api/tuskar.py +++ b/tuskar_ui/api/tuskar.py @@ -433,10 +433,6 @@ class Role(base.APIResourceWrapper): return "Tuskar::{0}-{1}".format(self.name, self.version) @property - def provider_resource_group_name(self): - return "{0}-{1}-servers".format(self.name, self.version) - - @property def parameter_prefix(self): return "{0}-{1}::".format(self.name, self.version) |