Merge pull request #2994 from emonty/issue/2920

Add user_data alias for userdata in os_server
This commit is contained in:
James Cammarata 2016-02-09 13:19:10 -05:00
commit 9fc4ed0458

View file

@ -545,7 +545,7 @@ def main():
network = dict(default=None), network = dict(default=None),
nics = dict(default=[], type='list'), nics = dict(default=[], type='list'),
meta = dict(default=None), meta = dict(default=None),
userdata = dict(default=None), userdata = dict(default=None, aliases=['user_data']),
config_drive = dict(default=False, type='bool'), config_drive = dict(default=False, type='bool'),
auto_ip = dict(default=True, type='bool', aliases=['auto_floating_ip', 'public_ip']), auto_ip = dict(default=True, type='bool', aliases=['auto_floating_ip', 'public_ip']),
floating_ips = dict(default=None), floating_ips = dict(default=None),