openstack/openstack-ansible
Code Issues Proposed changes

Merge "Temporarily disable UCA usage in OpenStack-CI"

Browse Source
This commit is contained in:
Jenkins 2016-06-15 21:43:04 +00:00 committed by Gerrit Code Review
commit a5286ed760
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
View File

@ -118,6 +118,16 @@
tags: tags:
- generate_secrets - 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 - name: Determine if the host has a global pip config file
stat: stat:
path: /etc/pip.conf path: /etc/pip.conf

5
tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
View File

@ -98,3 +98,8 @@ apply_security_hardening: true
## Wheel mirrors for the repo_build to use ## Wheel mirrors for the repo_build to use
repo_build_pip_extra_indexes: {{ repo_build_pip_extra_indexes }} repo_build_pip_extra_indexes: {{ repo_build_pip_extra_indexes }}
{% endif %} {% endif %}
{% if nova_uca_enable is defined %}
## TODO(odyssey4me) Remove this once OpenStack-Infra has UCA mirrors
nova_uca_enable: {{ nova_uca_enable }}
{% endif %}