Use only yum Ansible in CI setup

So for months now Ansible sourced from yum and Ansible sourced
from pip could exist on the same machine and function just fine.
But as of a few days ago in the Newton and now rhos-10 CI pipeline
the dependency loading semantics have changed and this is no longer
possible.

This commit switches to relying on the package manager version.

Change-Id: I21737c6f6900f3ed4011fe7de91fc34a1d984fc3
This commit is contained in:
jkilpatr 2017-04-12 20:45:12 -04:00 committed by Justin Kilpatrick
parent 180740305c
commit e4cc89fdc3
2 changed files with 6 additions and 14 deletions

View File

@ -0,0 +1,3 @@
browbeat_dependencies:
- rsync
- ansible

View File

@ -1,8 +1,9 @@
---
- name: Make sure rsync is installed
yum: name=rsync state=present
- name: Make sure dependencies ar installed
package: name={{item}} state=present
become: true
with_items: "{{ browbeat_dependencies }}"
- name: Copy browbeat to the undercloud
synchronize: "src={{ local_working_dir }}/browbeat dest={{ ansible_env.HOME }}/ use_ssh_args=yes"
@ -21,15 +22,3 @@
- name: Load CI vars
include_vars: "{{ lookup('env','HW_ENV_DIR') }}/all.yml"
- name: Install Pip
retries: 10
delay: 60
until: pip.rc == 0
register: pip
shell: curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"; sudo python get-pip.py
become: true
- name: Install Ansible
pip: name=ansible state=present
become: true