Skip to content

Commit d87f528

Browse files
committed
fedora
1 parent a0d2439 commit d87f528

File tree

6 files changed

+13
-5
lines changed

6 files changed

+13
-5
lines changed

README-tooling.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ vault_docker_hub_password: hub_secret
4545
- Memory 12GB disk 30GB
4646
- Ansilbe install environments
4747
- [Python pip](http://pypi.org/project/pip)
48-
- [RPM Package Manager (RPM)](https://en.wikipedia.org/wiki/RPM_Package_Manager)
48+
- [RPM Package Manager (RPM)](http://en.wikipedia.org/wiki/RPM_Package_Manager)
4949
- [CentOS 7](http://centos.org) [iso image](http://isoredirect.centos.org/centos/7/isos/x86_64/CentOS-7-x86_64-NetInstall-2003.iso)
5050
- Network install source url http://mirror.centos.org/centos/7/os/x86_64/
5151
- Do not forget to make a user and make user superuser.
52-
- [Fedora 32](http://getfedora.org) [iso image](https://download.fedoraproject.org/pub/fedora/linux/releases/32/Server/x86_64/iso/Fedora-Server-netinst-x86_64-32-1.6.iso)
52+
- [Fedora 31](http://getfedora.org) [iso image](http://download.fedoraproject.org/pub/fedora/linux/releases/31/Server/x86_64/iso/Fedora-Server-netinst-x86_64-31-1.9.iso)
5353
- [Red Hat 8.2](http://redhat.com) @todo untested
5454
- [Advanced Package Tool (APT)](http://en.wikipedia.org/wiki/APT_(software))
55-
- [Debian 10](http://debian.org) [iso image](https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-10.4.0-amd64-netinst.iso)
56-
- [Ubuntu focal](http://ubuntu.com) [iso image](https://releases.ubuntu.com/20.04/ubuntu-20.04-live-server-amd64.iso)
55+
- [Debian 10](http://debian.org) [iso image](http://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-10.4.0-amd64-netinst.iso)
56+
- [Ubuntu focal](http://ubuntu.com) [iso image](http://releases.ubuntu.com/20.04/ubuntu-20.04-live-server-amd64.iso)
5757

5858
There are shell Ansible install scripts in this projects [bin directory](http://github.com/noud/elasticsearch-docker-ansible/tree/master/bin).
5959

bin/ansible-install-fedora.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env sh
2+
3+
sudo dnf install -y ansible

group_vars/all/RedHat.yml renamed to group_vars/all/CentOS.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# @todo centos check ansible_distribution_major_version
12
os_version: "{{ distribution_major_version }}"
23
os_packages:
34
- gcc

group_vars/all/Fedora.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# os_version: "{{ ansible_distribution_major_version }}"
2+
os_version: 31

group_vars/all/Ubuntu.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Debian.yml

localhost.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
user: super_user
33
become: yes
44
vars_files:
5-
- [ "group_vars/all/{{ ansible_facts['os_family'] }}.yml" ]
5+
- [ "group_vars/all/{{ ansible_facts['distribution'] }}.yml" ]
66

77
roles:
88
- role: packages
99
- role: packages_os
10+
when: ansible_facts['distribution'] != 'Fedora'
1011

1112
- role: pip
1213

0 commit comments

Comments
 (0)