diff options
| author | Rabi Mishra <ramishra@redhat.com> | 2020-01-17 17:37:03 +0530 |
|---|---|---|
| committer | Rabi Mishra <ramishra@redhat.com> | 2020-01-24 07:50:37 +0000 |
| commit | a62584005d7805efc336a83a442e65ffc2766b21 (patch) | |
| tree | a1143530ca028c428d61cfe578edff967ef9c722 | |
| parent | 5b24267c599ad248dfbd381a20452ed6e2dbcd90 (diff) | |
| download | heat-a62584005d7805efc336a83a442e65ffc2766b21.tar.gz | |
Fix Designate Zone ID lookup for real
When there are no 'supported_versions' defined for a client plugin,
we should not use version when calling self.client()
Also fixes similar issue in resources.
Task: 38165
Change-Id: Ifce776e8e8375f6a4399574aa71cc2f81ecc57b0
(cherry picked from commit 2f63735a5c42443fbe9fa5f031259dd08db0bd7a)
| -rw-r--r-- | heat/engine/clients/os/designate.py | 2 | ||||
| -rw-r--r-- | heat/engine/resources/openstack/designate/recordset.py | 4 | ||||
| -rw-r--r-- | heat/engine/resources/openstack/designate/zone.py | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/heat/engine/clients/os/designate.py b/heat/engine/clients/os/designate.py index 9a2b25a2f..05c4c7da4 100644 --- a/heat/engine/clients/os/designate.py +++ b/heat/engine/clients/os/designate.py @@ -39,7 +39,7 @@ class DesignateClientPlugin(client_plugin.ClientPlugin): return isinstance(ex, exceptions.NotFound) def get_zone_id(self, zone_id_or_name): - client = self.client(version='2') + client = self.client() try: zone_obj = client.zones.get(zone_id_or_name) return zone_obj['id'] diff --git a/heat/engine/resources/openstack/designate/recordset.py b/heat/engine/resources/openstack/designate/recordset.py index a97cb90ad..6a85c4aee 100644 --- a/heat/engine/resources/openstack/designate/recordset.py +++ b/heat/engine/resources/openstack/designate/recordset.py @@ -98,10 +98,6 @@ class DesignateRecordSet(resource.Resource): entity = 'recordsets' - def client(self): - return super(DesignateRecordSet, - self).client(version=self.client_plugin().V2) - def handle_create(self): args = dict((k, v) for k, v in six.iteritems(self.properties) if v) args['type_'] = args.pop(self.TYPE) diff --git a/heat/engine/resources/openstack/designate/zone.py b/heat/engine/resources/openstack/designate/zone.py index 6cd659c2a..0268b69a2 100644 --- a/heat/engine/resources/openstack/designate/zone.py +++ b/heat/engine/resources/openstack/designate/zone.py @@ -105,10 +105,6 @@ class DesignateZone(resource.Resource): entity = 'zones' - def client(self): - return super(DesignateZone, - self).client(version=self.client_plugin().V2) - def validate(self): super(DesignateZone, self).validate() |