cloudstack: use get_or_fallback() from cloudstack utils

This commit is contained in:
Rene Moser 2015-07-19 15:09:49 +02:00 committed by Matt Clay
parent 743ed1cd82
commit 1f25377ce9
6 changed files with 14 additions and 59 deletions

View file

@ -500,13 +500,6 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
return user_data
def get_display_name(self):
display_name = self.module.params.get('display_name')
if not display_name:
display_name = self.module.params.get('name')
return display_name
def deploy_instance(self):
self.result['changed'] = True
@ -555,7 +548,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
args_instance_update = {}
args_instance_update['id'] = instance['id']
args_instance_update['group'] = self.module.params.get('group')
args_instance_update['displayname'] = self.get_display_name()
args_instance_update['displayname'] = self.get_or_fallback('display_name', 'name')
args_instance_update['userdata'] = self.get_user_data()
args_instance_update['ostypeid'] = self.get_os_type(key='id')