diff --git a/changelogs/fragments/20241308-azure_manage_postgresql.yml b/changelogs/fragments/20241308-azure_manage_postgresql.yml new file mode 100644 index 00000000..3f648e83 --- /dev/null +++ b/changelogs/fragments/20241308-azure_manage_postgresql.yml @@ -0,0 +1,2 @@ +bugfixes: + - Removing redundant default variables from the role's default file. \ No newline at end of file diff --git a/roles/azure_manage_postgresql/defaults/main.yml b/roles/azure_manage_postgresql/defaults/main.yml index c5b5f5e6..93c2d4b5 100644 --- a/roles/azure_manage_postgresql/defaults/main.yml +++ b/roles/azure_manage_postgresql/defaults/main.yml @@ -1,8 +1,3 @@ --- azure_manage_postgresql_operation: create -azure_manage_postgresql_postgresql_version: "9.5" -azure_manage_postgresql_postgresql_settings: [] -azure_manage_postgresql_postgresql_firewall_rules: [] -azure_manage_postgresql_postgresql_database_instances: [] -azure_manage_postgresql_delete_server: false -azure_manage_postgresql_delete_resource_group: false +azure_manage_postgresql_postgresql_version: "11" diff --git a/roles/azure_manage_postgresql/tasks/delete.yml b/roles/azure_manage_postgresql/tasks/delete.yml index fac91a82..9b17f300 100644 --- a/roles/azure_manage_postgresql/tasks/delete.yml +++ b/roles/azure_manage_postgresql/tasks/delete.yml @@ -30,7 +30,9 @@ resource_group: "{{ azure_manage_postgresql_resource_group }}" name: "{{ azure_manage_postgresql_postgresql_name }}" state: absent - when: azure_manage_postgresql_delete_server + when: + - azure_manage_postgresql_delete_server is defined + - azure_manage_postgresql_delete_server - name: Delete Resource group if requested ansible.builtin.include_role: @@ -38,4 +40,6 @@ vars: azure_manage_resource_group_operation: delete azure_manage_resource_group_name: "{{ azure_manage_postgresql_resource_group }}" - when: azure_manage_postgresql_delete_resource_group + when: + - azure_manage_postgresql_delete_resource_group is defined + - azure_manage_postgresql_delete_resource_group diff --git a/tests/integration/targets/test_azure_manage_postgresql/tasks/create_and_delete_postgresql.yml b/tests/integration/targets/test_azure_manage_postgresql/tasks/create_and_delete_postgresql.yml index b22ee62f..1a51bcc6 100644 --- a/tests/integration/targets/test_azure_manage_postgresql/tasks/create_and_delete_postgresql.yml +++ b/tests/integration/targets/test_azure_manage_postgresql/tasks/create_and_delete_postgresql.yml @@ -7,7 +7,6 @@ - name: Set vars for test ansible.builtin.set_fact: - azure_manage_postgresql_postgresql_version: "9.6" azure_manage_postgresql_postgresql_firewall_rules: - name: "rule_0" start_ip_address: "172.10.1.0" @@ -39,7 +38,7 @@ - _postgresql.servers[0].sku.name == azure_manage_postgresql_postgresql_sku.name - _postgresql.servers[0].storage_mb == azure_manage_postgresql_postgresql_storage_mb - _postgresql.servers[0].admin_username == azure_manage_postgresql_postgresql_admin_username - - _postgresql.servers[0].version == azure_manage_postgresql_postgresql_version + - _postgresql.servers[0].version == "11" # Verify that PostgreSQL Server firewall rule was created as expected - name: Gather PostgreSQL Server firewall rule info