diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-12 18:17:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-12 18:17:38 +0000 |
| commit | 12dd1004ef4cb218cdfc5205e1e002297d8db838 (patch) | |
| tree | a8304c81b810b00f04cd1478a6e6c7e61a89a562 | |
| parent | fd369845b7fbda13478da66262819edee45648ad (diff) | |
| parent | 7a679652207150797376747e0a56605d1a3cad0a (diff) | |
| download | heat-12dd1004ef4cb218cdfc5205e1e002297d8db838.tar.gz | |
Merge "Fix Designate Zone lookup by name" into stable/rocky11.0.1
| -rw-r--r-- | heat/engine/clients/os/designate.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/heat/engine/clients/os/designate.py b/heat/engine/clients/os/designate.py index 6df4785a2..3989e98b5 100644 --- a/heat/engine/clients/os/designate.py +++ b/heat/engine/clients/os/designate.py @@ -57,14 +57,14 @@ class DesignateClientPlugin(client_plugin.ClientPlugin): name=domain_id_or_name) def get_zone_id(self, zone_id_or_name): + client = self.client(version=self.V2) try: - zone_obj = self.client(version=self.V2).zones.get(zone_id_or_name) + zone_obj = client.zones.get(zone_id_or_name) return zone_obj['id'] except exceptions.NotFound: - zones = self.client().zones.list( - criterion=dict(name=zone_id_or_name)) + zones = client.zones.list(criterion=dict(name=zone_id_or_name)) if len(zones) == 1: - return zones[0]['id'] + return zones[0]['id'] raise heat_exception.EntityNotFound(entity='Designate Zone', name=zone_id_or_name) |