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.

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

Improve ecs instance and eni docs #146

Merged
merged 1 commit into from
Dec 31, 2018
Merged
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ FEATURES:

IMPROVEMENTS:

- Improve ecs instance and eni docs ([#146](https://github.com/alibaba/ansible-provider/pull/146))
- Improve module ali_eip and add its testcase ([#145](https://github.com/alibaba/ansible-provider/pull/145))
- Improve dynamic inventory by setting page_size 100 ([#142](https://github.com/alibaba/ansible-provider/pull/142))
- Improve ali_security_group and make it idempotence ([#137](https://github.com/alibaba/ansible-provider/pull/137))
6 changes: 3 additions & 3 deletions lib/ansible/modules/cloud/alicloud/ali_eni_facts.py
Original file line number Diff line number Diff line change
@@ -80,9 +80,9 @@
# Gather facts based on vpc and name_prefix
- ali_eni_facts:
tags:
name: Example
env: dev
name_prefix: foo
filters:
vswitch_id: vpc-dsfh2ef2
'''

RETURN = '''
12 changes: 6 additions & 6 deletions lib/ansible/modules/cloud/alicloud/ali_instance.py
Original file line number Diff line number Diff line change
@@ -382,11 +382,6 @@
returned: always
type: string
sample: m-0011223344
inner_ip_address:
description: The inner IPv4 address of the classic instance.
returned: always
type: string
sample: 10.0.0.2
instance_charge_type:
description: The instance charge type.
returned: always
@@ -402,6 +397,11 @@
returned: always
type: string
sample: ecs.sn1ne.xlarge
instance_type_family:
description: The instance type family of the instance belongs.
returned: always
type: string
sample: ecs.sn1ne
internet_charge_type:
description: The billing method of the network bandwidth.
returned: always
@@ -463,7 +463,7 @@
type: string
sample: 10.0.0.1
public_ip_address:
description: The public IPv4 address assigned to the instance
description: The public IPv4 address assigned to the instance or eip address
returned: always
type: string
sample: 43.0.0.1
12 changes: 6 additions & 6 deletions lib/ansible/modules/cloud/alicloud/ali_instance_facts.py
Original file line number Diff line number Diff line change
@@ -212,11 +212,6 @@
returned: always
type: string
sample: m-0011223344
inner_ip_address:
description: The inner IPv4 address of the classic instance.
returned: always
type: string
sample: 10.0.0.2
instance_charge_type:
description: The instance charge type.
returned: always
@@ -227,6 +222,11 @@
returned: always
type: string
sample: my-ecs
instance_type_family:
description: The instance type family of the instance belongs.
returned: always
type: string
sample: ecs.sn1ne
instance_type:
description: The instance type of the running instance.
returned: always
@@ -293,7 +293,7 @@
type: string
sample: 10.0.0.1
public_ip_address:
description: The public IPv4 address assigned to the instance
description: The public IPv4 address assigned to the instance or eip address
returned: always
type: string
sample: 43.0.0.1