From 3aa172fb1659925a837b432649793f9f1f46cca9 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sat, 6 Jan 2018 19:27:04 +0100
Subject: deploy.sh: Print sysinfo

JIRA: FUEL-323

Change-Id: I0dcbcfbedc7e9ef013ca50dcc08f804323f91701
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 ci/deploy.sh                      |  3 +++
 mcp/scripts/requirements_deb.yaml |  1 +
 mcp/scripts/requirements_rpm.yaml |  1 +
 mcp/scripts/sysinfo_print.sh      | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+)
 create mode 100755 mcp/scripts/sysinfo_print.sh

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 19ae23ccb..501a36c67 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -289,6 +289,9 @@ if ! virsh list >/dev/null 2>&1; then
     exit 1
 fi
 
+# Collect jump server system information for deploy debugging
+./sysinfo_print.sh
+
 # Clone git submodules and apply our patches
 make -C "${REPO_ROOT_PATH}/mcp/patches" deepclean patches-import
 
diff --git a/mcp/scripts/requirements_deb.yaml b/mcp/scripts/requirements_deb.yaml
index 84b75ee65..9a6ec8273 100644
--- a/mcp/scripts/requirements_deb.yaml
+++ b/mcp/scripts/requirements_deb.yaml
@@ -9,6 +9,7 @@
 requirements_pkg:
   # Common pkgs required for all deploys, no matter the type, arch etc.
   common:
+    - bridge-utils
     - cloud-guest-utils
     - cpu-checker
     - curl
diff --git a/mcp/scripts/requirements_rpm.yaml b/mcp/scripts/requirements_rpm.yaml
index 0ee95febb..daf5e62e2 100644
--- a/mcp/scripts/requirements_rpm.yaml
+++ b/mcp/scripts/requirements_rpm.yaml
@@ -10,6 +10,7 @@ requirements_pkg:
   # Common pkgs required for all deploys, no matter the type, arch etc.
   common:
     - bc
+    - bridge-utils
     - cloud-utils-growpart
     - curl
     - e2fsprogs
diff --git a/mcp/scripts/sysinfo_print.sh b/mcp/scripts/sysinfo_print.sh
new file mode 100755
index 000000000..bff36aff4
--- /dev/null
+++ b/mcp/scripts/sysinfo_print.sh
@@ -0,0 +1,18 @@
+#!/bin/bash -ex
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+#
+# Collect jump server system information for deploy debugging
+#
+
+# Network info
+brctl show
+
+# Distro & pkg info
+cat /etc/*-release
+uname -a
-- 
cgit 1.2.3-korg