Merge pull request #1696 from chrismeyersfsu/fix-azure-password

ensure password or ssh cert specified
This commit is contained in:
Brian Coca 2015-07-10 13:57:11 -04:00
commit bba1e66896

View file

@ -567,8 +567,8 @@ def main():
module.fail_json(msg='location parameter is required for new instance') module.fail_json(msg='location parameter is required for new instance')
if not module.params.get('storage_account'): if not module.params.get('storage_account'):
module.fail_json(msg='storage_account parameter is required for new instance') module.fail_json(msg='storage_account parameter is required for new instance')
if not module.params.get('password'): if not (module.params.get('password') or module.params.get('ssh_cert_path')):
module.fail_json(msg='password parameter is required for new instance') module.fail_json(msg='password or ssh_cert_path parameter is required for new instance')
(changed, public_dns_name, deployment) = create_virtual_machine(module, azure) (changed, public_dns_name, deployment) = create_virtual_machine(module, azure)
module.exit_json(changed=changed, public_dns_name=public_dns_name, deployment=json.loads(json.dumps(deployment, default=lambda o: o.__dict__))) module.exit_json(changed=changed, public_dns_name=public_dns_name, deployment=json.loads(json.dumps(deployment, default=lambda o: o.__dict__)))