diff options
author | Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> | 2018-06-25 11:19:04 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-06-25 11:19:04 +0000 |
commit | b935c3228523c30dacdaba551ecee3703ff78168 (patch) | |
tree | 4f24f8430239c8cb378518dc81855d04b70be609 /yardstick/benchmark/contexts | |
parent | 9d84f5ad73e9689d3131e4ce09fe7262697c5817 (diff) | |
parent | 55d5d9245c615436921167e24c5e49a59c53f590 (diff) |
Merge "Add "volumes" parameter in Kubernetes context"
Diffstat (limited to 'yardstick/benchmark/contexts')
-rw-r--r-- | yardstick/benchmark/contexts/kubernetes.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/yardstick/benchmark/contexts/kubernetes.py b/yardstick/benchmark/contexts/kubernetes.py index 82435d40c..d322954b2 100644 --- a/yardstick/benchmark/contexts/kubernetes.py +++ b/yardstick/benchmark/contexts/kubernetes.py @@ -15,7 +15,7 @@ import pkg_resources import paramiko from yardstick.benchmark.contexts.base import Context -from yardstick.orchestrator.kubernetes import KubernetesTemplate +from yardstick.orchestrator import kubernetes from yardstick.common import kubernetes_utils as k8s_utils from yardstick.common import utils @@ -38,11 +38,8 @@ class KubernetesContext(Context): def init(self, attrs): super(KubernetesContext, self).init(attrs) - template_cfg = attrs.get('servers', {}) - self.template = KubernetesTemplate(self.name, template_cfg) - + self.template = kubernetes.KubernetesTemplate(self.name, attrs) self.ssh_key = '{}-key'.format(self.name) - self.key_path = self._get_key_path() self.public_key_path = '{}.pub'.format(self.key_path) |