Remove ipip check where it's not needed.

Change-Id: Ia84f5ee5476ee0dd476d3f8415afb8bb26301e6e
This commit is contained in:
Sergey Lebedev 2016-09-22 12:44:28 +03:00
parent 39a7ea963f
commit e6d5a2fe48
1 changed files with 4 additions and 4 deletions

View File

@ -98,7 +98,6 @@ class TestFuelCCPInstaller(base_test.SystemBaseTest,
self.check_number_kube_nodes(underlay, k8sclient)
self.check_list_required_images(
underlay, required_images=self.base_images)
self.calico_ipip_exists(underlay)
self.check_etcd_health(underlay)
nginx = self.get_nginx_spec()
pod = k8s_actions.check_pod_create(body=nginx)
@ -140,7 +139,8 @@ class TestFuelCCPInstaller(base_test.SystemBaseTest,
self.check_number_kube_nodes(underlay, k8sclient)
self.check_list_required_images(underlay,
required_images=required_images)
self.calico_ipip_exists(underlay)
if kube_settings['ipip']:
self.calico_ipip_exists(underlay)
self.check_etcd_health(underlay)
nginx = self.get_nginx_spec()
pod = k8s_actions.check_pod_create(body=nginx)
@ -182,7 +182,8 @@ class TestFuelCCPInstaller(base_test.SystemBaseTest,
self.check_number_kube_nodes(underlay, k8sclient)
self.check_list_required_images(underlay,
required_images=required_images)
self.calico_ipip_exists(underlay)
if kube_settings['ipip']:
self.calico_ipip_exists(underlay)
self.check_etcd_health(underlay)
nginx = self.get_nginx_spec()
pod = k8s_actions.check_pod_create(body=nginx)
@ -218,7 +219,6 @@ class TestFuelCCPInstaller(base_test.SystemBaseTest,
self.check_number_kube_nodes(underlay, k8sclient)
self.check_list_required_images(
underlay, required_images=self.base_images)
self.calico_ipip_exists(underlay)
self.check_etcd_health(underlay)
nginx = self.get_nginx_spec()
pod = k8s_actions.check_pod_create(body=nginx)