Skip to content
Permalink
Browse files

Merge "Add support for osp15/rhel8"

  • Loading branch information...
Zuul authored and openstack-gerrit committed Jul 22, 2019
2 parents ef85b1f + 4723144 commit 64409f5c31fa7ecdc476c66cfb9039e036a038f7
Showing with 25 additions and 5 deletions.
  1. +25 −5 ansible/install/roles/browbeat/tasks/main.yml
@@ -21,11 +21,31 @@
- openssl-devel
- policycoreutils-python
- python-devel
when: ansible_distribution_major_version < '8'

- name: Install dependencies for RHEL8
yum:
name: "{{ item }}"
state: present
become: true
with_items:
- gcc
- gcc-c++
- git
- libffi-devel
- python3-libsemanage
- openssl-devel
- python3-policycoreutils
- python3-devel
- python3-pip
- python3-virtualenv
when: ansible_distribution_major_version == '8'

- name: Install pip
easy_install:
name: pip
become: true
when: ansible_distribution_major_version < '8'

- name: Update virtualenv and setuptools
pip:
@@ -37,7 +57,7 @@
version: 15.2.0
- name: setuptools
version: 38.7.0
when: ansible_user != "zuul"
when: ansible_user != "zuul" and ansible_distribution_major_version < '8'

- name: Install virtualenv and setuptools- zuul user
pip:
@@ -46,7 +66,7 @@
with_items:
- virtualenv
- setuptools
when: ansible_user == "zuul"
when: ansible_user == "zuul" and ansible_distribution_major_version < '8'

- name: Determine if browbeat directory exists already
stat:
@@ -82,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"
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'

- 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"
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'

- 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))"
when: "(tripleo and (not hosts_file_exists.stat.exists or not hosts_file_exists.stat.isreg)) and ansible_distribution_major_version < '8'"

- name: Install requirements.txt into browbeat-venv
pip:

0 comments on commit 64409f5

Please sign in to comment.
You can’t perform that action at this time.