Correct minor pike branch config issues

Bifrost has many knobs, and we've not yet made a list
of things that need to be followed-up with each stable
release.

As such, we need to ensure we install the appropriate
stable branch versions from source.

Set the branch, set the IPA image to be the pike image
and change inspector to install from source, as the default
master branch behavior is to use the released version for
testing.

Change-Id: Ia5b63602949db9c11cce3ae40f753b01d59084cc

playbooks/roles/bifrost-ironic-install/defaults/main.yml

@@ -7,7 +7,7 @@ staging_drivers_include: false
 file_url_port: "8080"
 ironicclient_source_install: false
 shade_source_install: true
-ironicinspector_source_install: false
+ironicinspector_source_install: true
 ironicinspectorclient_source_install: false
 staging_drivers_source_install: false
 # Setting to utilize diskimage-builder to create a bootable image.
@@ -43,11 +43,11 @@ ipa_file_protocol: "http"
 ipa_kernel: "{{http_boot_folder}}/ipa.vmlinuz"
 ipa_ramdisk: "{{http_boot_folder}}/ipa.initramfs"
 ipa_kernel_url: "{{ ipa_file_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{file_url_port}}/ipa.vmlinuz"
-ipa_kernel_upstream_url: https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa-master.vmlinuz
+ipa_kernel_upstream_url: https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa-stable-pike.vmlinuz
 ipa_kernel_upstream_checksum_algo: "sha256"
 ipa_kernel_upstream_checksum_url: "{{ ipa_kernel_upstream_url }}.{{ ipa_kernel_upstream_checksum_algo }}"
 ipa_ramdisk_url: "{{ ipa_file_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{file_url_port}}/ipa.initramfs"
-ipa_ramdisk_upstream_url: https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa-master.gz
+ipa_ramdisk_upstream_url: https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa-stable-pike.gz
 ipa_ramdisk_upstream_checksum_algo: "sha256"
 ipa_ramdisk_upstream_checksum_url: "{{ ipa_ramdisk_upstream_url }}.{{ ipa_ramdisk_upstream_checksum_algo }}"
 deploy_image_filename: "deployment_image.qcow2"

playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml

@@ -195,6 +195,15 @@
   with_items:
     - "/var/lib/ironic"
     - "/var/lib/ironic/images"
+- name: "Create and set /var/log/ironic"
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: 0755
+    owner: "ironic"
+    group: "ironic"
+  with_items:
+    - "/var/log/ironic"
 - name: "Place ironic services"
   template:
     src: "{{ init_template }}"

playbooks/roles/bifrost-prep-for-install/defaults/main.yml

@@ -24,14 +24,14 @@ staging_drivers_git_folder: "{{ git_root }}/ironic-staging-drivers"
 keystone_git_folder: "{{ git_root}}/keystone"
 # *_git_branch can be overridden for stable branch testing
 ironicclient_git_branch: master
-ironic_git_branch: master
+ironic_git_branch: stable/pike
 shade_git_branch: master
 dib_git_branch: master
-ironicinspector_git_branch: master
+ironicinspector_git_branch: stable/pike
 ironicinspectorclient_git_branch: master
-reqs_git_branch: master
-staging_drivers_git_branch: master
-keystone_git_branch: master
+reqs_git_branch: stable/pike
+staging_drivers_git_branch: stable/pike
+keystone_git_branch: stable/pike
 
 # Conditional variables utilized based on CI or manual testing options.
 copy_from_local_path: false

playbooks/test-bifrost.yaml

@@ -76,7 +76,7 @@
     # NOTE(TheJulia): While the next step creates a ramdisk, some elements
     # do not support ramdisk-image-create as they invoke steps to cleanup
     # the ramdisk which causes ramdisk-image-create to believe it failed.
-    - { role: bifrost-create-dib-image, dib_imagename: "{{ http_boot_folder }}/ipa", build_ramdisk: false, dib_os_element: "{{ ipa_dib_os_element|default('debian') }}", dib_os_release: "jessie", dib_elements: "ironic-agent {{ ipa_extra_dib_elements | default('') }}", when: create_ipa_image | bool == true }
+    - { role: bifrost-create-dib-image, dib_imagename: "{{ http_boot_folder }}/ipa", build_ramdisk: false, dib_os_element: "{{ ipa_dib_os_element|default('debian') }}", dib_os_release: "jessie", dib_elements: "ironic-agent {{ ipa_extra_dib_elements | default('') }}", dib_packages: "bsdmainutils", when: create_ipa_image | bool == true }
     - { role: bifrost-create-dib-image, dib_imagetype: "qcow2", dib_imagename: "{{deploy_image}}", dib_os_element: "debian", dib_os_release: "jessie", dib_elements: "vm enable-serial-console simple-init {{ extra_dib_elements|default('') }}", when: create_image_via_dib | bool == true and transform_boot_image | bool == false }
     - role: bifrost-keystone-client-config
       user: "{{ ansible_env.SUDO_USER | default(ansible_user_id) }}"

scripts/collect-test-info.sh

@@ -36,14 +36,26 @@ fi
 if $(journalctl --version &>/dev/null); then
     sudo journalctl -u ironic-api &> ${LOG_LOCATION}/ironic-api.log
     sudo journalctl -u ironic-conductor &> ${LOG_LOCATION}/ironic-conductor.log
+    sudo journalctl -u ironic-inspector &> ${LOG_LOCATION}/ironic-inspector.log
 else
    sudo cp /var/log/upstart/ironic-api.log ${LOG_LOCATION}/
    sudo cp /var/log/upstart/ironic-conductor.log ${LOG_LOCATION}/
+   sudo cp /var/log/upstart/ironic-inspector.log ${LOG_LOCATION}/ || true
 fi
+sudo cp -r /var/log/libvirt ${LOG_LOCATION}/
+sudo virsh net-show default >> ${LOG_LOCATION}/virsh-net-show.log
+
 sudo chown $USER ${LOG_LOCATION}/ironic-api.log
 sudo chown $USER ${LOG_LOCATION}/ironic-conductor.log
+sudo chown $USER ${LOG_LOCATION}/ironic-inspector.log || true
 # In CI scenarios, we want other users to be able to read the logs.
 sudo chmod o+r ${LOG_LOCATION}/ironic-api.log
 sudo chmod o+r ${LOG_LOCATION}/ironic-conductor.log
+sudo chmod o+r ${LOG_LOCATION}/ironic-inspector.log || true
 
+if [ -d "/var/log/ironic" ]; then
+    sudo cp -a /var/log/ironic ${LOG_LOCATION}/
+fi
+sudo chown -R $USER ${LOG_LOCATION}/
+sudo chmod -R o+r ${LOG_LOCATION}/
 exit 0