summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2018-09-28 18:43:09 +0100
committerMark Goddard <mark@stackhpc.com>2018-09-28 18:43:11 +0100
commite327a8430761ebe1965b0420d92b7c370adcc21a (patch)
treee0aff4ac92ffb5fc5d34bcd00e6023236b25590c
parentbf732329abb0bbdda511d4c87988131c1f5ec7f2 (diff)
Save kolla-generated per-node configuration in CI logs
Currently we're saving the config generated by kayobe for kolla, but not the config generated by kolla for the containers. This change fixes that. Change-Id: I5558a4fb8285a4e96f6918d133452d664b7bf0fa
Notes
Notes (review): Code-Review+2: Doug Szumski <doug@stackhpc.com> Code-Review+2: Will Szumski <will@stackhpc.com> Workflow+1: Will Szumski <will@stackhpc.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 02 Nov 2018 17:20:04 +0000 Reviewed-on: https://review.openstack.org/606149 Project: openstack/kayobe Branch: refs/heads/master
-rw-r--r--roles/kayobe-diagnostics/files/get_logs.sh1
-rw-r--r--roles/kayobe-diagnostics/tasks/pre.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/roles/kayobe-diagnostics/files/get_logs.sh b/roles/kayobe-diagnostics/files/get_logs.sh
index b8a16d2..a3f797f 100644
--- a/roles/kayobe-diagnostics/files/get_logs.sh
+++ b/roles/kayobe-diagnostics/files/get_logs.sh
@@ -14,6 +14,7 @@ copy_logs() {
14 if [[ -d ${CONFIG_DIR} ]]; then 14 if [[ -d ${CONFIG_DIR} ]]; then
15 cp -rnL ${CONFIG_DIR}/etc/kayobe/* ${LOG_DIR}/kayobe_configs 15 cp -rnL ${CONFIG_DIR}/etc/kayobe/* ${LOG_DIR}/kayobe_configs
16 cp -rnL ${CONFIG_DIR}/etc/kolla/* ${LOG_DIR}/kolla_configs 16 cp -rnL ${CONFIG_DIR}/etc/kolla/* ${LOG_DIR}/kolla_configs
17 cp -rnL /etc/kolla/* ${LOG_DIR}/kolla_node_configs
17 # Don't save the IPA images. 18 # Don't save the IPA images.
18 rm ${LOG_DIR}/kayobe_configs/kolla/config/ironic/ironic-agent.{kernel,initramfs} 19 rm ${LOG_DIR}/kayobe_configs/kolla/config/ironic/ironic-agent.{kernel,initramfs}
19 rm ${LOG_DIR}/kolla_configs/config/ironic/ironic-agent.{kernel,initramfs} 20 rm ${LOG_DIR}/kolla_configs/config/ironic/ironic-agent.{kernel,initramfs}
diff --git a/roles/kayobe-diagnostics/tasks/pre.yml b/roles/kayobe-diagnostics/tasks/pre.yml
index a4c5673..f2f3b14 100644
--- a/roles/kayobe-diagnostics/tasks/pre.yml
+++ b/roles/kayobe-diagnostics/tasks/pre.yml
@@ -13,6 +13,7 @@
13 - "docker_logs" 13 - "docker_logs"
14 - "kayobe_configs" 14 - "kayobe_configs"
15 - "kolla_configs" 15 - "kolla_configs"
16 - "kolla_node_configs"
16 - "system_logs" 17 - "system_logs"
17 - "kolla" 18 - "kolla"
18 - "ansible" 19 - "ansible"