From 56dd23d0744cc60a3a900356c590266ca23686d7 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sat, 9 Sep 2017 03:09:18 +0200
Subject: log.sh: Collect /var/log from cluster nodes

Bring back <ci/deploy.sh> parameter `-L`, which is already passed by
releng deploy script.

Since we need to enable file_recv on salt master, do so by adding a
new class in <virtual-mcp-ocata-common/infra/config.yml>, which will
be inherited by all scenario reclass models.

JIRA: FUEL-288

Change-Id: I9b649315984fb8580b63883d0e06c1e1efd11057
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 .../virtual-mcp-ocata-common/infra/config.yml      |  4 +++
 .../virtual-mcp-ocata-odl-router/infra/config.yml  |  1 +
 .../virtual-mcp-ocata-ovs-dpdk/infra/config.yml    |  1 +
 .../cluster/virtual-mcp-ocata-ovs/infra/config.yml |  1 +
 mcp/scripts/log.sh                                 | 35 ++++++++++++++++++++++
 mcp/scripts/salt.sh                                |  2 --
 6 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
 create mode 100755 mcp/scripts/log.sh

(limited to 'mcp')

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
new file mode 100644
index 000000000..b7f8985b7
--- /dev/null
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
@@ -0,0 +1,4 @@
+parameters:
+  salt:
+    master:
+      file_recv: true
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
index 63e58a24b..39edab299 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
@@ -11,6 +11,7 @@ classes:
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.opendaylight_control_single
+- cluster.virtual-mcp-ocata-common.infra.config
 - cluster.virtual-mcp-ocata-odl-router
 parameters:
   _param:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
index 864c71daa..56cfa6ed9 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
@@ -10,6 +10,7 @@ classes:
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
+- cluster.virtual-mcp-ocata-common.infra.config
 - cluster.virtual-mcp-ocata-ovs-dpdk
 parameters:
   _param:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index 97730b1fd..1cfded091 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -10,6 +10,7 @@ classes:
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_compute_multi
 - system.reclass.storage.system.openstack_gateway_single
+- cluster.virtual-mcp-ocata-common.infra.config
 - cluster.virtual-mcp-ocata-ovs
 parameters:
   _param:
diff --git a/mcp/scripts/log.sh b/mcp/scripts/log.sh
new file mode 100755
index 000000000..1ae0953af
--- /dev/null
+++ b/mcp/scripts/log.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+##############################################################################
+# 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 /var/log from all cluster nodes via Salt Master
+#
+
+DEPLOY_LOG=$1
+OPNFV_TMP_LOG="opnfv_fuel_logs"
+
+[ -n "${DEPLOY_LOG}" ] || exit 0
+
+# ssh to cfg01
+# shellcheck disable=SC2086,2087
+ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << LOG_COLLECT_END
+  sudo -i
+
+  echo salt -C '*' cp.push_dir /var/log upload_path='${OPNFV_TMP_LOG}'
+  salt -C '*' cp.push_dir /var/log upload_path='${OPNFV_TMP_LOG}'
+
+  cd /var/cache/salt/master/minions && \
+    find */files/${OPNFV_TMP_LOG}/ | \
+      xargs tar czf \$(eval echo \~\${SUDO_USER}/${OPNFV_TMP_LOG}.tar.gz) \
+        --transform 's|/files/${OPNFV_TMP_LOG}||'
+LOG_COLLECT_END
+
+# shellcheck disable=SC2086
+scp ${SSH_OPTS} "${SSH_SALT}:${OPNFV_TMP_LOG}.tar.gz" "${DEPLOY_LOG}"
+# shellcheck disable=SC2086,2029
+ssh ${SSH_OPTS} "${SSH_SALT}" rm -f "${OPNFV_TMP_LOG}.tar.gz"
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 4fa54ab1c..174471e91 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -11,8 +11,6 @@
 #
 
 F_GIT_ROOT=$(git rev-parse --show-toplevel)
-SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu}
-SSH_SALT="${SALT_MASTER_USER}@${SALT_MASTER}"
 OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/fuel"
 OPNFV_FUEL_DIR="/root/fuel"
 
-- 
cgit 1.2.3-korg