diff --git a/CHANGELOG.md b/CHANGELOG.md index fc912cc2..f0d47154 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)) diff --git a/lib/ansible/modules/cloud/alicloud/ali_eni_facts.py b/lib/ansible/modules/cloud/alicloud/ali_eni_facts.py index c413806b..b8729b98 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_eni_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_eni_facts.py @@ -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 = ''' diff --git a/lib/ansible/modules/cloud/alicloud/ali_instance.py b/lib/ansible/modules/cloud/alicloud/ali_instance.py index c6cba85b..ad3b7504 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_instance.py +++ b/lib/ansible/modules/cloud/alicloud/ali_instance.py @@ -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 diff --git a/lib/ansible/modules/cloud/alicloud/ali_instance_facts.py b/lib/ansible/modules/cloud/alicloud/ali_instance_facts.py index 1c25cbc4..169467a5 100644 --- a/lib/ansible/modules/cloud/alicloud/ali_instance_facts.py +++ b/lib/ansible/modules/cloud/alicloud/ali_instance_facts.py @@ -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