Prep CI for Pike

So this detects if a deployment was containerized and then
stores that in the metadata. This also disables results in httpd
since that seems to cause problems for Pike deployments at the moment

The final change is some sort of permissions problem with running ping
during the browbeat install. I'd like to find a better solution than
just slapping sudo on the front though.

Change-Id: I57c0006bc9abe861782ebdfb918b4151bba67eae
This commit is contained in:
jkilpatr 2017-06-29 09:32:34 -04:00 committed by Justin Kilpatrick
parent 9410abeb7b
commit 2a581e28b4
4 changed files with 10 additions and 2 deletions

View File

@ -6,6 +6,7 @@
command: ping google.com -c 1 -q
register: ping
ignore_errors: true
become: true
tags:
# Skip ANSIBLE0012 Commands should not change things if nothing needs doing
# Need to check external activity every time

View File

@ -5,7 +5,6 @@
hosts: undercloud
roles:
- browbeat/pre-install-setup
- browbeat/oooq-metadata
- name: Setup Undercloud CollectD
hosts: undercloud
@ -26,7 +25,6 @@
roles:
- browbeat/common
- browbeat/browbeat
- browbeat/browbeat-results
- browbeat/firewall
- browbeat/perfkitbenchmarker
- browbeat/rally
@ -37,6 +35,7 @@
- browbeat/browbeat-network
- browbeat/template-configs
- browbeat/statsd-ironic
- browbeat/oooq-metadata
- name: Disable sshd dns
hosts: overcloud

View File

@ -6,6 +6,13 @@
register: build
ignore_errors: true
- name: Determine if deployment is containerized
stat:
path: /usr/lib/systemd/system/docker.service
register: docker_service_file
delegate_to: overcloud-controller-0
become: True
- name: Make sure the results directory exists
file: "path={{ ansible_env.HOME }}/browbeat/metadata state=directory"

View File

@ -8,6 +8,7 @@
{
"osp_series": "{{series}}",
"osp_version": "{{version}}",
"containerized:": "{{docker_service_file.stat.exists}}",
"dlrn_hash": "{{dlrn_hash}}",
"logs_link": "{{logs_link}}",
"rhos_puddle": "{{rhos_puddle}}",