Skip to content

Fix centos8 tasks #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 5 commits into from
Jul 7, 2020
Merged

Fix centos8 tasks #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
91d9578
fixes
shwstppr Jul 6, 2020
0b9fa6d
revert
shwstppr Jul 6, 2020
1fee8f4
Merge branch 'master' into fix-centos8-tasks
shwstppr Jul 6, 2020
da85b0b
disable firewalld when use_firewalld=false
shwstppr Jul 6, 2020
cc9e49d
ipmitool workaround
shwstppr Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Ansible/roles/cloudstack-manager/tasks/centos8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,7 @@
#- name: Open 8096 when Marvin is required (CentOS 7)
# shell: firewall-cmd --permanent --zone=public --add-port=8096/tcp && firewall-cmd --reload
# when: (num_marv_hosts > 0) and (ansible_distribution_major_version == "7")

# Workaround for https://github.com/apache/cloudstack/issues/4204
- name: Patch ipmitool yo ipmitool-1.8.18-12.el8_1.x86_64.rpm
shell: "rpm -i https://rpmfind.net/linux/centos/8.1.1911/AppStream/x86_64/os/Packages/ipmitool-1.8.18-12.el8_1.x86_64.rpm --force"
7 changes: 7 additions & 0 deletions Ansible/roles/kvm/tasks/centos8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,13 @@
enabled=yes
when: ( ansible_distribution_major_version|int >= 7 ) and use_firewalld

- name: Stop firewalld CentOS7/8
service:
name=firewalld
state=stopped
enabled=no
when: ( ansible_distribution_major_version|int >= 7 ) and (use_firewalld|bool == False)

- include: ./add_local_storage.yml
when: use_local_storage
tags:
Expand Down
2 changes: 1 addition & 1 deletion Ansible/roles/timezone/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version == "6" )

- include: ./centos7.yml
when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version == "7" )
when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( ansible_distribution_major_version|int >= 7 )

- include: ./ubuntu.yml
when: ansible_distribution == 'Ubuntu'