Remove unnecessary has_client() checks

After moving some resources into main tree, and also
according some clients are required in heat registation,
we should remove some unnecessary has_client() checks.
And this change will remove the unnecessary
available_resource_mapping() defination.

Change-Id: Ia88826ca9698886f05e55ed68ef773bfe3c8c696
This commit is contained in:
huangtianhua 2015-06-17 16:58:38 +08:00
parent 093594c576
commit 28763b321f
6 changed files with 0 additions and 43 deletions

View File

@ -16,7 +16,6 @@ import six
from heat.common import exception
from heat.common.i18n import _
from heat.engine import attributes
from heat.engine import clients
from heat.engine import constraints
from heat.engine import properties
from heat.engine import resource
@ -199,10 +198,3 @@ def resource_mapping():
return {
'OS::Barbican::Order': Order,
}
def available_resource_mapping():
if not clients.has_client('barbican'):
return {}
return resource_mapping()

View File

@ -15,7 +15,6 @@ import six
from heat.common.i18n import _
from heat.engine import attributes
from heat.engine import clients
from heat.engine import constraints
from heat.engine import properties
from heat.engine import resource
@ -141,10 +140,3 @@ def resource_mapping():
return {
'OS::Barbican::Secret': Secret,
}
def available_resource_mapping():
if not clients.has_client('barbican'):
return {}
return resource_mapping()

View File

@ -339,7 +339,3 @@ class SwiftSignal(resource.Resource):
def resource_mapping():
return {'OS::Heat::SwiftSignal': SwiftSignal,
'OS::Heat::SwiftSignalHandle': SwiftSignalHandle}
def available_resource_mapping():
return resource_mapping()

View File

@ -12,7 +12,6 @@
# under the License.
from heat.common.i18n import _
from heat.engine import clients
from heat.engine import constraints
from heat.engine import properties
from heat.engine import resource
@ -110,10 +109,3 @@ def resource_mapping():
return {
'OS::Manila::SecurityService': SecurityService
}
def available_resource_mapping():
if not clients.has_client('manila'):
return {}
return resource_mapping()

View File

@ -12,7 +12,6 @@
# under the License.
from heat.common.i18n import _
from heat.engine import clients
from heat.engine import properties
from heat.engine import resource
from heat.engine import support
@ -100,10 +99,3 @@ def resource_mapping():
return {
'OS::Manila::ShareType': ManilaShareType
}
def available_resource_mapping():
if not clients.has_client('manila'):
return {}
return resource_mapping()

View File

@ -14,7 +14,6 @@
from heat.common import exception
from heat.common.i18n import _
from heat.engine import attributes
from heat.engine import clients
from heat.engine import properties
from heat.engine import resource
from heat.engine import support
@ -131,9 +130,3 @@ def resource_mapping():
return {
'OS::Zaqar::Queue': ZaqarQueue,
}
def available_resource_mapping():
if not clients.has_client('zaqar'):
return {}
return resource_mapping()