diff options
| author |   Yu Yang (Gabriel) <Gabriel.yuyang@huawei.com> | 2017-01-12 08:42:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-12 08:42:52 +0000 |
| commit | b2bab28cd8c8e72b230a6286f7d951f1c873bd83 (patch) | |
| tree | 032549981f284d00c008d4e21f399fb6901bfc35 /utils/infra_setup | |
| parent | e1a54d34819563946d1ff1ec673d1d261b826ad8 (diff) | |
| parent | 08b12e7a7f0b5971282c371b0d0b9320030f3874 (diff) | |
Merge "Modify utils/ code into PEP8 style"
Diffstat (limited to 'utils/infra_setup')
| -rw-r--r-- | utils/infra_setup/__init__.py | 2 | ||||
| -rwxr-xr-x | utils/infra_setup/heat/common.py | 3 | ||||
| -rwxr-xr-x | utils/infra_setup/heat/consts/parameters.py | 1 | ||||
| -rwxr-xr-x | utils/infra_setup/heat/template.py | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/utils/infra_setup/__init__.py b/utils/infra_setup/__init__.py index 38727287..b124dfa9 100644 --- a/utils/infra_setup/__init__.py +++ b/utils/infra_setup/__init__.py @@ -5,4 +5,4 @@ # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 -##############################################################################
\ No newline at end of file +############################################################################## diff --git a/utils/infra_setup/heat/common.py b/utils/infra_setup/heat/common.py index 28257ac7..ab0dadf5 100755 --- a/utils/infra_setup/heat/common.py +++ b/utils/infra_setup/heat/common.py @@ -97,6 +97,7 @@ def get_heat_api_version(): return api_version return DEFAULT_HEAT_API_VERSION + def get_nova_api_version(): api_version = os.getenv('OS_COMPUTE_API_VERSION') if api_version is not None: @@ -110,4 +111,4 @@ def get_glance_api_version(): if api_version is not None: log.info("GLANCE_API_VERSION is set in env as '%s'", api_version) return api_version - return DEFAULT_GLANCE_API_VERSION
\ No newline at end of file + return DEFAULT_GLANCE_API_VERSION diff --git a/utils/infra_setup/heat/consts/parameters.py b/utils/infra_setup/heat/consts/parameters.py index f275c25b..15aa5b5d 100755 --- a/utils/infra_setup/heat/consts/parameters.py +++ b/utils/infra_setup/heat/consts/parameters.py @@ -7,7 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -import files # ------------------------------------------------------ # Directories and file locations diff --git a/utils/infra_setup/heat/template.py b/utils/infra_setup/heat/template.py index 28c20b72..cc652fb4 100755 --- a/utils/infra_setup/heat/template.py +++ b/utils/infra_setup/heat/template.py @@ -114,9 +114,9 @@ class HeatStack(HeatObject): i += 1 if self.uuid is not None: - sys.exit("delete stack failed!!!") + sys.exit("delete stack failed!!!") else: - HeatStack.stacks.remove(self) + HeatStack.stacks.remove(self) @staticmethod def delete_all(): |