From 2f0c129c45245aeb1f6ab142c32c373ecc8286c4 Mon Sep 17 00:00:00 2001 From: Jiri Tomasek Date: Mon, 22 Jun 2015 13:11:30 +0200 Subject: 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 --- tuskar_ui/api/heat.py | 2 +- tuskar_ui/api/tuskar.py | 4 ---- 2 files changed, 1 insertion(+), 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 @@ -432,10 +432,6 @@ class Role(base.APIResourceWrapper): def provider_resource_type(self): 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) -- cgit v1.2.1