Merge "Log additional hyperkube info after cluster deployment"

This commit is contained in:
Jenkins 2016-11-18 13:39:05 +00:00 committed by Gerrit Code Review
commit bbd10ffddd
2 changed files with 35 additions and 0 deletions

View File

@ -13,6 +13,7 @@
# under the License.
import re
import json
from devops.helpers import helpers
@ -61,3 +62,28 @@ def required_images_exists(node_name, underlay, required_images):
.format(required_image), image)
for image in images)
for required_image in required_images)
def inspect_docker_containers(image_name, underlay, host_ip):
result = None
cmd = "docker inspect " \
"$(docker ps --filter ancestor={image_name} --format={{{{.ID}}}})"\
.format(image_name=image_name)
if underlay:
with underlay.remote(host=host_ip) as remote:
result = remote.execute(cmd)
if result:
LOG.info("Inspecting running containers with name={name}: on: {node}".
format(name=image_name, node=host_ip))
for container in result.stdout_json:
raw_out = container['Config']['Labels']
labels = json.dumps(
raw_out,
indent=4,
separators=(',', ': '),
sort_keys=True
)
LOG.info("Docker container {name} Labels: {labels}".format(
name=container['Name'],
labels=labels)
)

View File

@ -20,6 +20,7 @@ from devops.helpers import helpers
from fuel_ccp_tests.helpers import exceptions
from fuel_ccp_tests.helpers import _subprocess_runner
from fuel_ccp_tests.helpers import post_install_k8s_checks
from fuel_ccp_tests import logger
from fuel_ccp_tests import settings
from fuel_ccp_tests.managers.k8s import cluster
@ -158,6 +159,14 @@ class K8SManager(object):
self.mark_lvm_nodes(lvm_config)
hkube_image_name = '{}:{}'.format(
settings.HYPERKUBE_IMAGE_REPO, settings.HYPERKUBE_IMAGE_TAG
)
post_install_k8s_checks.inspect_docker_containers(
image_name=hkube_image_name,
underlay=self.__underlay,
host_ip=k8s_admin_ip)
return result
@property