commit 0594cd70acf23f68948dc25ffd8c7879018f1695
author Artem Panchenko <apanchenko@mirantis.com> Mon Jun 12 13:25:26 2017 +0300
committer Tatyanka Leontovich <tleontovich@mirantis.com> Wed Jun 14 05:44:41 2017 -0400
tree a8867e21d32e1f17649a84346ef7c8c4b711a3e2
parent 3645d2be52639e7198708cde40d672c3b2767a46

Added 'k8s_deployed' fixture

Created a separate fixture for Kubernetes deployment.
Modified existing k8s related fixtures / tests so they
use it now and updated templates with k8s environments.

Also this patch includes few minor changes:

 * removed unused fixture 'deploy_openstack' which
   was a full copy of 'openstack_deployed' fixture;
 * removed unused modules imports;
 * fixed typos and docstrings.

Change-Id: Ic35551f3e52913cede753b92e7d5a81f54570b01
Reviewed-on: https://review.gerrithub.io/365234
Reviewed-by: <vrovachev@mirantis.com>
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Tatyanka Leontovich <tleontovich@mirantis.com>

tcp_tests/settings_oslo.py

diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index c68f1f2..a932296 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -49,6 +49,9 @@
 _default_virtlet_ceph_prepare_tests_steps_path = pkg_resources.resource_filename(
     __name__, 'templates/{0}/virtlet_ceph.yaml'.format(
         settings.LAB_CONFIG_NAME))
+_default_k8s_steps = pkg_resources.resource_filename(
+    __name__, 'templates/{0}/k8s.yaml'.format(
+        settings.LAB_CONFIG_NAME))
 
 hardware_opts = [
     ct.Cfg('manager', ct.String(),
@@ -171,6 +174,12 @@
 ]
 
 k8s_deploy_opts = [
+    ct.Cfg('k8s_steps_path', ct.String(),
+           help="Path to YAML with steps to deploy Kubernetes",
+           default=_default_k8s_steps),
+    ct.Cfg('kubernetes_admin_user', ct.String(), default='admin'),
+    ct.Cfg('kubernetes_admin_password', ct.String(),
+           default='sbPfel23ZigJF3Bm'),
     ct.Cfg('kubernetes_docker_package', ct.String(), default=''),
     ct.Cfg('kubernetes_hyperkube_image', ct.String(),
            default='{}/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2'.format(
@@ -184,6 +193,8 @@
     ct.Cfg('kubernetes_calico_cni_image', ct.String(),
            default='{}/mirantis/projectcalico/calico/cni:latest'.format(
                settings.DOCKER_REGISTRY)),
+    ct.Cfg('kubernetes_netchecker_enabled', ct.Boolean(),
+           help="", default=True),
     ct.Cfg('kubernetes_netchecker_agent_image', ct.String(),
            default='mirantis/k8s-netchecker-agent:latest'),
     ct.Cfg('kubernetes_netchecker_server_image', ct.String(),
@@ -191,6 +202,8 @@
 ]
 
 k8s_opts = [
+    ct.Cfg('k8s_installed', ct.Boolean(),
+           help="", default=False),
     ct.Cfg('kube_host', ct.IPAddress(),
            help="", default='0.0.0.0'),
     ct.Cfg('kube_apiserver_port', ct.Integer(),