A few cleanups and some comments. Nothing major.
Signed-off-by: Ian Main <imain@redhat.com>
This commit is contained in:
parent
024ccee734
commit
622bb9a702
7
bin/heat
7
bin/heat
|
@ -19,7 +19,8 @@
|
||||||
"""
|
"""
|
||||||
This is the administration program for heat. It is simply a command-line
|
This is the administration program for heat. It is simply a command-line
|
||||||
interface for adding, modifying, and retrieving information about the stacks
|
interface for adding, modifying, and retrieving information about the stacks
|
||||||
belonging to a user.
|
belonging to a user. It is a convenience application that talks to the heat
|
||||||
|
API server.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import functools
|
import functools
|
||||||
|
@ -107,7 +108,7 @@ def stack_create(options, arguments):
|
||||||
return FAILURE
|
return FAILURE
|
||||||
|
|
||||||
if options.parameters:
|
if options.parameters:
|
||||||
count=1
|
count = 1
|
||||||
for p in options.parameters.split(';'):
|
for p in options.parameters.split(';'):
|
||||||
(n, v) = p.split('=')
|
(n, v) = p.split('=')
|
||||||
parameters['Parameters.member.%d.ParameterKey' % count] = n
|
parameters['Parameters.member.%d.ParameterKey' % count] = n
|
||||||
|
@ -144,7 +145,7 @@ def stack_update(options, arguments):
|
||||||
parameters['TemplateUrl'] = options.template_url
|
parameters['TemplateUrl'] = options.template_url
|
||||||
|
|
||||||
if options.parameters:
|
if options.parameters:
|
||||||
count=1
|
count = 1
|
||||||
for p in options.parameters.split(';'):
|
for p in options.parameters.split(';'):
|
||||||
(n, v) = p.split('=')
|
(n, v) = p.split('=')
|
||||||
parameters['Parameters.member.%d.ParameterKey' % count] = n
|
parameters['Parameters.member.%d.ParameterKey' % count] = n
|
||||||
|
|
|
@ -19,7 +19,9 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Heat API Server
|
Heat API Server. This implements an approximation of the Amazon
|
||||||
|
CloudFormations API and translates it into a native representation. It then
|
||||||
|
calls the heat-engine via REST to implement them.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import gettext
|
import gettext
|
||||||
|
|
|
@ -15,7 +15,9 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Heat Engine Server
|
Heat Engine Server. This does the work of actually implementing the API
|
||||||
|
calls made by the user. Normal communications is done via the heat API
|
||||||
|
which then calls into this engine.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import gettext
|
import gettext
|
||||||
|
|
|
@ -88,7 +88,7 @@ class V1Client(base_client.BaseClient):
|
||||||
data = json.loads(res.read())
|
data = json.loads(res.read())
|
||||||
return data
|
return data
|
||||||
|
|
||||||
Client = V1Client
|
HeatClient = V1Client
|
||||||
|
|
||||||
|
|
||||||
def get_client(host, port=None, username=None,
|
def get_client(host, port=None, username=None,
|
||||||
|
@ -128,7 +128,7 @@ def get_client(host, port=None, username=None,
|
||||||
use_ssl = (creds['auth_url'] is not None and
|
use_ssl = (creds['auth_url'] is not None and
|
||||||
creds['auth_url'].find('https') != -1)
|
creds['auth_url'].find('https') != -1)
|
||||||
|
|
||||||
client = Client
|
client = HeatClient
|
||||||
|
|
||||||
return client(host=host,
|
return client(host=host,
|
||||||
port=port,
|
port=port,
|
||||||
|
|
Loading…
Reference in New Issue