From c670032c252f7f9870cb8e455c1fc6daebd2236a Mon Sep 17 00:00:00 2001 From: Charles Short Date: Thu, 15 Aug 2019 09:58:46 -0400 Subject: [PATCH] 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 --- ansible/install/roles/browbeat/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/install/roles/browbeat/tasks/main.yml b/ansible/install/roles/browbeat/tasks/main.yml index 7a54278de..01c95a243 100644 --- a/ansible/install/roles/browbeat/tasks/main.yml +++ b/ansible/install/roles/browbeat/tasks/main.yml @@ -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: