From 2a581e28b40b1544daa928651cb081979e617b9c Mon Sep 17 00:00:00 2001
From: jkilpatr <jkilpatr@redhat.com>
Date: Thu, 29 Jun 2017 09:32:34 -0400
Subject: [PATCH] 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
---
 ansible/install/roles/common/tasks/main.yml                | 1 +
 .../oooq/baremetal-virt-undercloud-tripleo-browbeat.yml    | 3 +--
 ansible/oooq/roles/oooq-metadata/tasks/main.yml            | 7 +++++++
 ansible/oooq/roles/oooq-metadata/templates/version.json.j2 | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ansible/install/roles/common/tasks/main.yml b/ansible/install/roles/common/tasks/main.yml
index a068f9a60..930207840 100644
--- a/ansible/install/roles/common/tasks/main.yml
+++ b/ansible/install/roles/common/tasks/main.yml
@@ -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
diff --git a/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml b/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml
index ab380f65e..4c81a43c5 100644
--- a/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml
+++ b/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml
@@ -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
diff --git a/ansible/oooq/roles/oooq-metadata/tasks/main.yml b/ansible/oooq/roles/oooq-metadata/tasks/main.yml
index 5d4e756cf..2c8ffa112 100644
--- a/ansible/oooq/roles/oooq-metadata/tasks/main.yml
+++ b/ansible/oooq/roles/oooq-metadata/tasks/main.yml
@@ -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"
 
diff --git a/ansible/oooq/roles/oooq-metadata/templates/version.json.j2 b/ansible/oooq/roles/oooq-metadata/templates/version.json.j2
index 00a0c61bd..662c11bc4 100644
--- a/ansible/oooq/roles/oooq-metadata/templates/version.json.j2
+++ b/ansible/oooq/roles/oooq-metadata/templates/version.json.j2
@@ -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}}",