From b06b42455e5440773f9ef24d9cb8d925361766e7 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Fri, 7 Dec 2012 15:27:58 +0100 Subject: [PATCH] Get rid of pointless cloudformation.py file Change-Id: Ib75cf51903029f7ba38a48acb62eb35d3ccbb763 Signed-off-by: Zane Bitter --- heat/client.py | 9 ++++++++- heat/cloudformation.py | 21 --------------------- 2 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 heat/cloudformation.py diff --git a/heat/client.py b/heat/client.py index 1d76a7f4..68126536 100644 --- a/heat/client.py +++ b/heat/client.py @@ -22,13 +22,20 @@ import os import json from heat.common import client as base_client from heat.common import exception -from heat.cloudformation import * from heat.openstack.common import log as logging logger = logging.getLogger(__name__) +SUPPORTED_PARAMS = ('StackName', 'TemplateBody', 'TemplateUrl', + 'NotificationARNs', 'Parameters', 'Version', + 'SignatureVersion', 'Timestamp', 'AWSAccessKeyId', + 'Signature', 'TimeoutInMinutes', + 'LogicalResourceId', 'PhysicalResourceId', 'NextToken', +) + + class V1Client(base_client.BaseClient): """Main client class for accessing heat resources""" diff --git a/heat/cloudformation.py b/heat/cloudformation.py deleted file mode 100644 index fd0dbfcb..00000000 --- a/heat/cloudformation.py +++ /dev/null @@ -1,21 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -SUPPORTED_PARAMS = ('StackName', 'TemplateBody', 'TemplateUrl', - 'NotificationARNs', 'Parameters', 'Version', - 'SignatureVersion', 'Timestamp', 'AWSAccessKeyId', - 'Signature', 'TimeoutInMinutes', - 'LogicalResourceId', 'PhysicalResourceId', 'NextToken', -) -- 2.45.2