From ade33a3baaac82e530489ee4930407e969c229b0 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Fri, 10 Jun 2016 11:42:24 +0100
Subject: [PATCH] Temporarily disable UCA usage in OpenStack-CI

OpenStack-CI does not have Ubuntu Cloud Archive (UCA) mirrors at this stage.
The implementation of Ic1e7619b48a9b12ba876f83507497cf1e557223a set the
usage of UCA for nova to be the default, which is good for production
environments.

This patch temporarily disables its usage in OpenStack-CI while the mirror
of UCA is arranged in OpenStack-Infra.

Change-Id: I0aec0447e1faf5ae21ce542945082079d3a59727
---
 .../roles/bootstrap-host/tasks/prepare_aio_config.yml  | 10 ++++++++++
 .../bootstrap-host/templates/user_variables.aio.yml.j2 |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
index c3eae941db..71525ded99 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
@@ -118,6 +118,16 @@
   tags:
     - generate_secrets
 
+- name: Detect whether the host is an OpenStack-CI host
+  stat:
+    path: /etc/nodepool
+  register: nodepool_dir
+
+- name: Disable nova using UCA in OpenStack-CI
+  set_fact:
+    nova_uca_enable: False
+  when: nodepool_dir.stat.exists
+
 - name: Determine if the host has a global pip config file
   stat:
     path: /etc/pip.conf
diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
index 808adefbc8..59d4e87c98 100644
--- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
@@ -98,3 +98,8 @@ apply_security_hardening: true
 ## Wheel mirrors for the repo_build to use
 repo_build_pip_extra_indexes: {{ repo_build_pip_extra_indexes }}
 {% endif %}
+
+{% if nova_uca_enable is defined %}
+## TODO(odyssey4me) Remove this once OpenStack-Infra has UCA mirrors
+nova_uca_enable: {{ nova_uca_enable }}
+{% endif %}