Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ACI EPG TO DOMAIN: Add vm_provider docstring and add support for micr… #29114

Merged
merged 3 commits into from
Sep 12, 2017
Merged

ACI EPG TO DOMAIN: Add vm_provider docstring and add support for micr… #29114

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7f9f66
ACI EPG TO DOMAIN: Add vm_provider docstring and add support for micr…
jmcgill298 Sep 7, 2017
b593b92
Fix typo
jmcgill298 Sep 7, 2017
4773680
Fix whitespace
jmcgill298 Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/ansible/modules/network/aci/aci_epg_to_domain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@
description:
- Name of an existing tenant.
aliases: [ tenant_name ]
vm_provider:
description:
- The VM platform for VMM Domains.
choices: [ microsoft, openstack, vmware ]
extends_documentation_fragment: aci
'''

Expand All @@ -105,7 +109,7 @@
from ansible.module_utils.aci import ACIModule, aci_argument_spec
from ansible.module_utils.basic import AnsibleModule

VM_PROVIDER_MAPPING = dict(vmware="uni/vmmp-VMware/dom-")
VM_PROVIDER_MAPPING = dict(microsoft="uni/vmmp-Microsoft/dom-", openstack="uni/vmmp-OpenStack/dom-", vmware="uni/vmmp-VMware/dom-")


def main():
Expand All @@ -124,7 +128,7 @@ def main():
resolution_immediacy=dict(type='str', choices=['immediate', 'lazy', 'pre-provision']),
state=dict(type='str', default='present', choices=['absent', 'present', 'query']),
tenant=dict(type='str', aliases=['tenant_name']),
vm_provider=dict(type='str', choices=['vmware']), # TODO: Find out OVS and Hyper-V options
vm_provider=dict(type='str', choices=['microsoft', 'openstack', 'vmware']),
method=dict(type='str', choices=['delete', 'get', 'post'], aliases=['action'], removed_in_version='2.6'), # Deprecated starting from v2.6
)

Expand Down