summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Beisner <ryan.beisner@canonical.com>2018-02-21 07:36:24 -0600
committerRyan Beisner <ryan.beisner@canonical.com>2018-02-21 14:09:38 -0600
commitf5213021b7195895c7f9df3e194afd27ff01c4ce (patch)
tree6321d0303633f0c14b8a86d0c70313130693ecb3
parentd43e264d02bf66b616782dc8b834243f7ef094f2 (diff)
Sync charm-helpers
Notes
Notes (review): Verified+1: Canonical CI <uosci-testing-bot@ubuntu.com> Code-Review+2: James Page <james.page@canonical.com> Workflow+1: James Page <james.page@canonical.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 22 Feb 2018 09:51:39 +0000 Reviewed-on: https://review.openstack.org/546610 Project: openstack/charm-nova-cloud-controller Branch: refs/heads/master
-rw-r--r--hooks/charmhelpers/contrib/openstack/amulet/utils.py4
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 3 deletions
diff --git a/hooks/charmhelpers/contrib/openstack/amulet/utils.py b/hooks/charmhelpers/contrib/openstack/amulet/utils.py
index 87f364d..d93cff3 100644
--- a/hooks/charmhelpers/contrib/openstack/amulet/utils.py
+++ b/hooks/charmhelpers/contrib/openstack/amulet/utils.py
@@ -92,7 +92,7 @@ class OpenStackAmuletUtils(AmuletUtils):
92 return 'endpoint not found' 92 return 'endpoint not found'
93 93
94 def validate_v3_endpoint_data(self, endpoints, admin_port, internal_port, 94 def validate_v3_endpoint_data(self, endpoints, admin_port, internal_port,
95 public_port, expected): 95 public_port, expected, expected_num_eps=3):
96 """Validate keystone v3 endpoint data. 96 """Validate keystone v3 endpoint data.
97 97
98 Validate the v3 endpoint data which has changed from v2. The 98 Validate the v3 endpoint data which has changed from v2. The
@@ -138,7 +138,7 @@ class OpenStackAmuletUtils(AmuletUtils):
138 if ret: 138 if ret:
139 return 'unexpected endpoint data - {}'.format(ret) 139 return 'unexpected endpoint data - {}'.format(ret)
140 140
141 if len(found) != 3: 141 if len(found) != expected_num_eps:
142 return 'Unexpected number of endpoints found' 142 return 'Unexpected number of endpoints found'
143 143
144 def validate_svc_catalog_endpoint_data(self, expected, actual): 144 def validate_svc_catalog_endpoint_data(self, expected, actual):
diff --git a/tox.ini b/tox.ini
index 6d44f4b..dae5362 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ skipsdist = True
9setenv = VIRTUAL_ENV={envdir} 9setenv = VIRTUAL_ENV={envdir}
10 PYTHONHASHSEED=0 10 PYTHONHASHSEED=0
11 CHARM_DIR={envdir} 11 CHARM_DIR={envdir}
12 AMULET_SETUP_TIMEOUT=2700 12 AMULET_SETUP_TIMEOUT=5400
13install_command = 13install_command =
14 pip install --allow-unverified python-apt {opts} {packages} 14 pip install --allow-unverified python-apt {opts} {packages}
15commands = ostestr {posargs} 15commands = ostestr {posargs}