x
/
flame
Code Issues Proposed changes

Fix refactoring bugs that broke the command line

This commit is contained in:
George Peristerakis 2014-09-19 12:32:26 -04:00
parent ddc2c802f1
commit 9dbb72d73a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flameclient/cmd.py
View File

@ -69,11 +69,11 @@ def main(args=None):
args = parser.parse_args()
template = TemplateGenerator(args.username, args.password, args.project,
args.auth_url, args.insecure)
template.extract_server_details(args.exclude_servers, args.exclude_volumes,
args.generate_stack_data)
template.extract_vm_details(args.exclude_servers, args.exclude_volumes,
args.generate_stack_data)
template.extract_data()
print("### Heat Template ###")
print(template.heat_template())
if args.generate_stack_data:
print("### Stack Data ###")
print(template.stack_data())
print(template.stack_data_template())

4
flameclient/flame.py
View File

@ -111,7 +111,7 @@ class TemplateGenerator(object):
for index, element in enumerate(data))
@staticmethod
def print_generated(filename, message):
def print_generated(filename):
print(yaml.safe_dump(filename, default_flow_style=False))
def add_resource(self, name, status, resource_id, resource_type):
@ -606,5 +606,5 @@ class TemplateGenerator(object):
def heat_template(self):
return self.print_generated(self.template)
def stack_data(self):
def stack_data_template(self):
return self.print_generated(self.stack_data)