From 2dad9c38a3ce6bee73d687b88de20a6a94e41662 Mon Sep 17 00:00:00 2001
From: Endre Karlson <endre.karlson@hp.com>
Date: Sat, 31 Oct 2015 00:23:53 +0100
Subject: [PATCH] Support OS_INTERFACE and set V2 API as default
This makes the client work with OS_INTERFACE / --os-interface and
makes it use the version 2 as default for dns.
Change-Id: I8d8bdd39f852dbe87846673d9bffc95b17e9a3cd
---
designateclient/osc/plugin.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/designateclient/osc/plugin.py b/designateclient/osc/plugin.py
index 4b266c57..d57c54d3 100644
--- a/designateclient/osc/plugin.py
+++ b/designateclient/osc/plugin.py
@@ -31,7 +31,9 @@ def make_client(instance):
cls = oscutils.get_client_class(
API_NAME, instance._api_version[API_NAME],
API_VERSIONS)
- return cls(session=instance.session)
+ kwargs = oscutils.build_kwargs_dict('endpoint_type', instance._interface)
+ return cls(session=instance.session,
+ region_name=instance._region_name, **kwargs)
def build_option_parser(parser):
@@ -39,7 +41,7 @@ def build_option_parser(parser):
parser.add_argument(
'--os-dns-api-version',
metavar='<dns-api-version>',
- default=shell.env('OS_DNS_API_VERSION'),
+ default=shell.env('OS_DNS_API_VERSION', default="2"),
help='DNS API version, default=' +
DEFAULT_API_VERSION +
' (Env: OS_DNS_API_VERSION)')