Skip to content

Commit

Permalink
Some fixes in test
Browse files Browse the repository at this point in the history
  • Loading branch information
Polina-Gubina committed May 4, 2021
1 parent 0a21628 commit 75a6de7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions plugins/modules/dns_zone.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@
default: public
zone_type:
description:
- Zone type: primary or secondary.
- Primary or secondary type.
- This parameter is disabled, it only provides compatibility with openstack.cloud colection.
choices: [primary, secondary]
type: str
masters:
description:
description:
- Master nameservers (only applies if zone_type is secondary).
- This parameter is disabled, it only provides compatibility with openstack.cloud colection.
type: list
Expand Down Expand Up @@ -149,7 +149,7 @@ def run(self):
query = {}

if self.params['type'] == 'private':
query['type'] = self.params['type']
query['zone_type'] = self.params['type']
query['name_or_id'] = self.params['name']
query['ignore_missing'] = True
zo = self.conn.dns.find_zone(**query)
Expand Down Expand Up @@ -206,7 +206,7 @@ def run(self):
message=('No Router found with name or id: %s' %
self.params['router'])
)
attrs['type'] = self.params['type']
attrs['zone_type'] = self.params['type']
if self.params['description']:
attrs['description'] = self.params['description']
if self.params['email']:
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/targets/dns/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
fl_ip: "{{ fl.floating_ip.floating_ip_address }}"
ptrdname: "{{ ( prefix + 'dns.com.' ) }}"
description: "{{ ( prefix + 'description-dns' ) }}"
zone_public_name: "{{ ( prefix + '-dnszone.com.' ) }}"
zone_private_name: "{{ ( prefix + '-dnszone.com.' ) }}"
rs_name: "{{ ( prefix + '-rs.' + prefix + '-dnszone.com.' ) }}"
zone_public_name: "{{ ( prefix + '-dnszonepublic.com.' ) }}"
zone_private_name: "{{ ( prefix + '-dnszoneprivate.com.' ) }}"
rs_name: "{{ ( prefix + '-rs.' + prefix + '-dnszonepublic.com.' ) }}"
network_name: "{{ ( prefix + '-dnsnetwork' )}}"
subnet_name: "{{ ( prefix + '-dnssubnet' )}}"
router_name: "{{ ( prefix + '-dnsrouter' )}}"
Expand Down

0 comments on commit 75a6de7

Please sign in to comment.