x
/
browbeat
Code Issues Proposed changes

Remove ansible check for inventory generation 

Since we use the same script on OSP15, remove the
restriction on running in RHEL8.

Change-Id: I4c5644b717229281668e725b9fe583406fdc5f8d
Signed-off-by: Charles Short <chucks@redhat.com>
This commit is contained in:
Charles Short 2019-08-15 09:58:46 -04:00
parent 3d13705713
commit c670032c25
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/install/roles/browbeat/tasks/main.yml
View File

@ -102,18 +102,18 @@
- name: Generate hosts and ssh-config on Browbeat Machine - Default(stack)
shell: . {{ home_dir }}/stackrc; {{ browbeat_path }}/ansible/generate_tripleo_hostfile.sh -t localhost --user stack
when: tripleo and (not hosts_file_exists.stat.exists or not hosts_file_exists.stat.isreg) and ansible_user!= "zuul" and ansible_distribution_major_version < '8'
when: tripleo and (not hosts_file_exists.stat.exists or not hosts_file_exists.stat.isreg) and ansible_user!= "zuul"
- name: Generate hosts and ssh-config on Browbeat Machine - Zuul
shell: . {{ home_dir }}/stackrc; {{ browbeat_path }}/ansible/generate_tripleo_hostfile.sh -t localhost --user zuul
when: tripleo and (not hosts_file_exists.stat.exists or not hosts_file_exists.stat.isreg) and ansible_user== "zuul" and ansible_distribution_major_version < '8'
when: tripleo and (not hosts_file_exists.stat.exists or not hosts_file_exists.stat.isreg) and ansible_user== "zuul"
- name: Move files to correct location
command: mv {{ home_dir }}/{{item}} {{ browbeat_path }}/ansible/{{item}}
with_items:
- hosts
- heat-admin-id_rsa
when: "(tripleo and (not hosts_file_exists.stat.exists or not hosts_file_exists.stat.isreg)) and ansible_distribution_major_version < '8'"
when: "(tripleo and (not hosts_file_exists.stat.exists or not hosts_file_exists.stat.isreg))"
- name: Install requirements.txt into browbeat-venv
pip: