From 8b146d9fd00996febd88bbf3ffc5784f57ddb9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Moser?= Date: Sat, 25 Sep 2021 13:40:04 +0200 Subject: [PATCH] release 2.2.0 (#86) --- .github/workflows/integration.yml | 3 +- CHANGELOG.rst | 15 ++++++++ changelogs/changelog.yaml | 15 ++++++++ .../78-cs_instance_extend_ip_to_networks.yml | 2 - .../fragments/79-cs_instance_fix_details.yml | 2 - .../82-cs_network_offering_new_args.yml | 2 - .../83-cs_instance_info_host_filter.yml | 2 - galaxy.yml | 2 +- .../targets/cs_common/tasks/main.yml | 6 +++ .../targets/cs_vpn_connection/tasks/main.yml | 8 ++-- .../cs_vpn_customer_gateway/tasks/main.yml | 38 +++++++++---------- 11 files changed, 61 insertions(+), 34 deletions(-) delete mode 100644 changelogs/fragments/78-cs_instance_extend_ip_to_networks.yml delete mode 100644 changelogs/fragments/79-cs_instance_fix_details.yml delete mode 100644 changelogs/fragments/82-cs_network_offering_new_args.yml delete mode 100644 changelogs/fragments/83-cs_instance_info_host_filter.yml diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 1ddc5e2..d9f24d4 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -19,8 +19,7 @@ jobs: fail-fast: false matrix: python-version: - - 3.6 - - 2.7 + - 3.8 group: - 1 - 2 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index dfe41a2..da589b7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,21 @@ Apache CloudStack Collection Release Notes .. contents:: Topics +v2.2.0 +====== + +Minor Changes +------------- + +- cs_instance - add support for MAC address and IPv6 in ``ip_to_networks`` (https://github.com/ngine-io/ansible-collection-cloudstack/issues/78). +- cs_instance_info - implemented support for ``host`` filter (https://github.com/ngine-io/ansible-collection-cloudstack/pull/83). +- cs_network_offering - implemented support for ``tags``, ``zones`` and ``domains`` (https://github.com/ngine-io/ansible-collection-cloudstack/pull/82). + +Bugfixes +-------- + +- cs_instance - Fixed custom service offerings usage (https://github.com/ngine-io/ansible-collection-cloudstack/issues/79). + v2.1.0 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index e6f83c2..cbb22ed 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -71,3 +71,18 @@ releases: name: instance namespace: null release_date: '2021-04-12' + 2.2.0: + changes: + bugfixes: + - cs_instance - Fixed custom service offerings usage (https://github.com/ngine-io/ansible-collection-cloudstack/issues/79). + minor_changes: + - cs_instance - add support for MAC address and IPv6 in ``ip_to_networks`` (https://github.com/ngine-io/ansible-collection-cloudstack/issues/78). + - cs_instance_info - implemented support for ``host`` filter (https://github.com/ngine-io/ansible-collection-cloudstack/pull/83). + - cs_network_offering - implemented support for ``tags``, ``zones`` and ``domains`` + (https://github.com/ngine-io/ansible-collection-cloudstack/pull/82). + fragments: + - 78-cs_instance_extend_ip_to_networks.yml + - 79-cs_instance_fix_details.yml + - 82-cs_network_offering_new_args.yml + - 83-cs_instance_info_host_filter.yml + release_date: '2021-09-01' diff --git a/changelogs/fragments/78-cs_instance_extend_ip_to_networks.yml b/changelogs/fragments/78-cs_instance_extend_ip_to_networks.yml deleted file mode 100644 index 02fff8a..0000000 --- a/changelogs/fragments/78-cs_instance_extend_ip_to_networks.yml +++ /dev/null @@ -1,2 +0,0 @@ -minor_changes: -- cs_instance - add support for MAC address and IPv6 in ``ip_to_networks`` (https://github.com/ngine-io/ansible-collection-cloudstack/issues/78). diff --git a/changelogs/fragments/79-cs_instance_fix_details.yml b/changelogs/fragments/79-cs_instance_fix_details.yml deleted file mode 100644 index 4ffc4e4..0000000 --- a/changelogs/fragments/79-cs_instance_fix_details.yml +++ /dev/null @@ -1,2 +0,0 @@ -bugfixes: -- cs_instance - Fixed custom service offerings usage (https://github.com/ngine-io/ansible-collection-cloudstack/issues/79). diff --git a/changelogs/fragments/82-cs_network_offering_new_args.yml b/changelogs/fragments/82-cs_network_offering_new_args.yml deleted file mode 100644 index 8b06c32..0000000 --- a/changelogs/fragments/82-cs_network_offering_new_args.yml +++ /dev/null @@ -1,2 +0,0 @@ -minor_changes: - - cs_network_offering - implemented support for ``tags``, ``zones`` and ``domains`` (https://github.com/ngine-io/ansible-collection-cloudstack/pull/82). diff --git a/changelogs/fragments/83-cs_instance_info_host_filter.yml b/changelogs/fragments/83-cs_instance_info_host_filter.yml deleted file mode 100644 index 38ec3a2..0000000 --- a/changelogs/fragments/83-cs_instance_info_host_filter.yml +++ /dev/null @@ -1,2 +0,0 @@ -minor_changes: - - cs_instance_info - implemented support for ``host`` filter (https://github.com/ngine-io/ansible-collection-cloudstack/pull/83). diff --git a/galaxy.yml b/galaxy.yml index 4ed7ed8..748b655 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -23,4 +23,4 @@ tags: - cloud - cloudstack - ngine_io -version: 2.1.0 +version: 2.2.0 diff --git a/tests/integration/targets/cs_common/tasks/main.yml b/tests/integration/targets/cs_common/tasks/main.yml index 1b206a0..ef54c91 100644 --- a/tests/integration/targets/cs_common/tasks/main.yml +++ b/tests/integration/targets/cs_common/tasks/main.yml @@ -1,4 +1,10 @@ --- +- name: install cs + pip: + name: + - cs + - sshpubkeys + - name: wait for system template available cs_template: name: "{{ cs_common_template }}" diff --git a/tests/integration/targets/cs_vpn_connection/tasks/main.yml b/tests/integration/targets/cs_vpn_connection/tasks/main.yml index 97e1d94..b54a6b4 100644 --- a/tests/integration/targets/cs_vpn_connection/tasks/main.yml +++ b/tests/integration/targets/cs_vpn_connection/tasks/main.yml @@ -3,7 +3,7 @@ cs_vpc: name: my_vpc display_text: my_vpc - cidr: 10.10.1.0/16 + cidr: 10.79.1.1/16 zone: "{{ cs_common_zone_adv }}" register: vpc - name: verify setup vpc @@ -14,11 +14,11 @@ - name: setup customer gateway cs_vpn_customer_gateway: name: my_vpn_customer_gateway - cidr: 192.168.123.0/24 + cidr: 192.168.79.0/24 esp_policy: aes256-sha1;modp1536 - gateway: 10.11.1.1 + gateway: 10.79.1.1 ike_policy: aes256-sha1;modp1536 - ipsec_psk: ~S3¢r3Tk3Y¼ + ipsec_psk: verysecurepassphrase esp_lifetime: 3600 register: vcg - name: setup customer gateway diff --git a/tests/integration/targets/cs_vpn_customer_gateway/tasks/main.yml b/tests/integration/targets/cs_vpn_customer_gateway/tasks/main.yml index d18d4b6..d5c7262 100644 --- a/tests/integration/targets/cs_vpn_customer_gateway/tasks/main.yml +++ b/tests/integration/targets/cs_vpn_customer_gateway/tasks/main.yml @@ -14,9 +14,9 @@ name: ansible_vpn_customer_gw cidr: 192.168.123.0/24 esp_policy: aes256-sha1;modp1536 - gateway: 10.10.0.1 + gateway: 10.123.1.1 ike_policy: aes256-sha1;modp1536 - ipsec_psk: ~S3¢r3Tk3Y¼ + ipsec_psk: verysecurepassphrase esp_lifetime: 3600 check_mode: true register: vcg @@ -30,9 +30,9 @@ name: ansible_vpn_customer_gw cidr: 192.168.123.0/24 esp_policy: aes256-sha1;modp1536 - gateway: 10.10.0.1 + gateway: 10.123.1.1 ike_policy: aes256-sha1;modp1536 - ipsec_psk: ~S3¢r3Tk3Y¼ + ipsec_psk: verysecurepassphrase esp_lifetime: 3600 register: vcg - name: verify test create vpn customer gateway @@ -45,7 +45,7 @@ - vcg.esp_policy == 'aes256-sha1;modp1536' - vcg.force_encap == false - vcg.ike_policy == 'aes256-sha1;modp1536' - - vcg.gateway == '10.10.0.1' + - vcg.gateway == '10.123.1.1' - vcg.name == 'ansible_vpn_customer_gw' - vcg.ike_lifetime == 86400 @@ -54,9 +54,9 @@ name: ansible_vpn_customer_gw cidr: 192.168.123.0/24 esp_policy: aes256-sha1;modp1536 - gateway: 10.10.0.1 + gateway: 10.123.1.1 ike_policy: aes256-sha1;modp1536 - ipsec_psk: ~S3¢r3Tk3Y¼ + ipsec_psk: verysecurepassphrase esp_lifetime: 3600 register: vcg - name: verify test create vpn customer gateway idempotency @@ -69,7 +69,7 @@ - vcg.esp_policy == 'aes256-sha1;modp1536' - vcg.force_encap == false - vcg.ike_policy == 'aes256-sha1;modp1536' - - vcg.gateway == '10.10.0.1' + - vcg.gateway == '10.123.1.1' - vcg.name == 'ansible_vpn_customer_gw' - vcg.ike_lifetime == 86400 @@ -80,9 +80,9 @@ - 192.168.123.0/24 - 192.168.124.0/24 esp_policy: aes256-sha1;modp1536 - gateway: 10.10.1.1 + gateway: 10.123.1.1 ike_policy: aes256-sha1;modp1536 - ipsec_psk: ~S3¢r3Tk3Y@ + ipsec_psk: verysecurepassphrase esp_lifetime: 1800 ike_lifetime: 23200 force_encap: true @@ -98,7 +98,7 @@ - vcg.esp_policy == 'aes256-sha1;modp1536' - vcg.force_encap == false - vcg.ike_policy == 'aes256-sha1;modp1536' - - vcg.gateway == '10.10.0.1' + - vcg.gateway == '10.123.1.1' - vcg.name == 'ansible_vpn_customer_gw' - vcg.ike_lifetime == 86400 @@ -109,9 +109,9 @@ - 192.168.123.0/24 - 192.168.124.0/24 esp_policy: aes256-sha1;modp1536 - gateway: 10.10.1.1 + gateway: 10.123.1.1 ike_policy: aes256-sha1;modp1536 - ipsec_psk: ~S3¢r3Tk3Y@ + ipsec_psk: verysecurepassphrase esp_lifetime: 1800 ike_lifetime: 23200 force_encap: true @@ -126,7 +126,7 @@ - vcg.esp_policy == 'aes256-sha1;modp1536' - vcg.force_encap == true - vcg.ike_policy == 'aes256-sha1;modp1536' - - vcg.gateway == '10.10.1.1' + - vcg.gateway == '10.123.1.1' - vcg.name == 'ansible_vpn_customer_gw' - vcg.ike_lifetime == 23200 @@ -137,9 +137,9 @@ - 192.168.123.0/24 - 192.168.124.0/24 esp_policy: aes256-sha1;modp1536 - gateway: 10.10.1.1 + gateway: 10.123.1.1 ike_policy: aes256-sha1;modp1536 - ipsec_psk: ~S3¢r3Tk3Y@ + ipsec_psk: verysecurepassphrase esp_lifetime: 1800 ike_lifetime: 23200 force_encap: true @@ -154,7 +154,7 @@ - vcg.esp_policy == 'aes256-sha1;modp1536' - vcg.force_encap == true - vcg.ike_policy == 'aes256-sha1;modp1536' - - vcg.gateway == '10.10.1.1' + - vcg.gateway == '10.123.1.1' - vcg.name == 'ansible_vpn_customer_gw' - vcg.ike_lifetime == 23200 @@ -174,7 +174,7 @@ - vcg.esp_policy == 'aes256-sha1;modp1536' - vcg.force_encap == true - vcg.ike_policy == 'aes256-sha1;modp1536' - - vcg.gateway == '10.10.1.1' + - vcg.gateway == '10.123.1.1' - vcg.name == 'ansible_vpn_customer_gw' - vcg.ike_lifetime == 23200 @@ -193,7 +193,7 @@ - vcg.esp_policy == 'aes256-sha1;modp1536' - vcg.force_encap == true - vcg.ike_policy == 'aes256-sha1;modp1536' - - vcg.gateway == '10.10.1.1' + - vcg.gateway == '10.123.1.1' - vcg.name == 'ansible_vpn_customer_gw' - vcg.ike_lifetime == 23200