more diagnostics, and switch to downloading vsg-1.1
Change-Id: I06cf99e66f823eb8f5a97c75fc369a4ee757a8f3
(cherry picked from commit dc4878f84c36819e60f58be5dcbf673bf903c6ac)
diff --git a/roles/compute-diag/tasks/main.yml b/roles/compute-diag/tasks/main.yml
index 88a6300..1f25508 100644
--- a/roles/compute-diag/tasks/main.yml
+++ b/roles/compute-diag/tasks/main.yml
@@ -9,9 +9,11 @@
- name: Compute node diag collection
shell: "{{ item }} > /tmp/{{ hostvars[groups['head'][0]]['diag_dir'] }}/{{ inventory_hostname }}/{{ item | regex_replace('[^\\w-]', '_')}}"
with_items:
+ - "date"
- "arp -n"
- "brctl show"
- "cat /etc/resolv.conf"
+ - "cat /etc/lsb-release"
- "ifconfig -a"
- "route -n"
- "sudo ovs-vsctl show"
diff --git a/roles/head-diag/files/docker_logs.sh b/roles/head-diag/files/docker_logs.sh
index ba22d6a..0a76bca 100644
--- a/roles/head-diag/files/docker_logs.sh
+++ b/roles/head-diag/files/docker_logs.sh
@@ -7,3 +7,6 @@
do
docker logs $container > ~/docker_logs/$container.log 2>&1;
done
+
+cp ~/service-profile/cord-pod/*.out ~/docker_logs
+
diff --git a/roles/head-diag/tasks/main.yml b/roles/head-diag/tasks/main.yml
index 1b40a2d..1dd4a9b 100644
--- a/roles/head-diag/tasks/main.yml
+++ b/roles/head-diag/tasks/main.yml
@@ -6,20 +6,22 @@
dest="~/{{ diag_dir }}/{{ item }}"
state=directory
with_items:
- - net
+ - head
- juju
- openstack
- onos
- xos
-- name: Networking diag collection
- shell: "{{ item }} > ~/{{ diag_dir }}/net/{{ item | regex_replace('[^\\w-]', '_')}}"
+- name: Head node diag collection
+ shell: "{{ item }} > ~/{{ diag_dir }}/head/{{ item | regex_replace('[^\\w-]', '_')}}"
with_items:
- "ifconfig -a"
- "route -n"
- "arp -n"
+ - "date"
- "brctl show"
- "cat /etc/resolv.conf"
+ - "cat /etc/lsb-release"
- "sudo uvt-kvm list"
- name: Juju diag collection
diff --git a/vars/cord.yml b/vars/cord.yml
index 65b7f4a..0b50c5d 100644
--- a/vars/cord.yml
+++ b/vars/cord.yml
@@ -38,9 +38,9 @@
- name: "trusty-server-multi-nic"
url: "http://www.vicci.org/opencloud/trusty-server-cloudimg-amd64-disk1.img"
checksum: "sha256:5fb160ea09649f9cebe5cfd7aaf3d1a341e8e0f9eca6e52e46eb6271155c48b0"
- - name: "vsg-1.0"
- url: "http://www.vicci.org/cord/vsg-1.0.img"
- checksum: "sha256:ba1f1dfd9099a21ed6512f9e08ceddafbc8302dcc0da66eda3a0318281219abc"
+ - name: "vsg-1.1"
+ url: "http://www.vicci.org/cord/vsg-1.1.img"
+ checksum: "sha256:16b0beb6778aed0f5feecb05f8d5750e6c262f98e6011e99ddadf7d46a177b6f"
# - name: ceilometer-trusty-server-multi-nic
# image_url: "http://www.vicci.org/cord/ceilometer-trusty-server-multi-nic.compressed.qcow2"
# checksum: "sha256:afde3f0448483902693be4d52ae76bb683fd74b1c7728019094bf81b37d86105"