aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2021-04-09 14:05:32 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2021-04-09 14:05:32 +0200
commit498078881c2516b457a656d5e237e1b8ae9aac2e (patch)
treed79f2cbb94ce7f10188682009dd226856ff77d7a
parent1fd6aaafe67a052e8c9c2a589bf0e24242b4e652 (diff)
downloadinfrastructure-498078881c2516b457a656d5e237e1b8ae9aac2e.tar.gz
infrastructure-498078881c2516b457a656d5e237e1b8ae9aac2e.zip
Remove hashicorp repofeature/upgrade-ansible
-rw-r--r--os/config/roles/common/tasks/hashicorp.yml24
-rw-r--r--os/config/roles/common/tasks/main.yml25
2 files changed, 4 insertions, 45 deletions
diff --git a/os/config/roles/common/tasks/hashicorp.yml b/os/config/roles/common/tasks/hashicorp.yml
deleted file mode 100644
index 9cf647b..0000000
--- a/os/config/roles/common/tasks/hashicorp.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-- name: "Add Hashicorps's official GPG key to apt"
- ansible.builtin.apt_key:
- url: https://apt.releases.hashicorp.com/gpg
- state: present
-
-- name: "Add Hashicorp's repository to APT sources list"
- ansible.builtin.apt_repository:
- repo: "deb [arch={{ architecture_map[ansible_architecture] }}] https://apt.releases.hashicorp.com {{ ansible_distribution_release }} main"
- state: present
- vars:
- architecture_map:
- "x86_64": "amd64"
- "aarch64": "arm64"
- "aarch": "arm64"
- "armhf": "armhf"
- "armv7l": "armhf"
-
-- name: "Install Nomad & Consul"
- ansible.builtin.apt:
- state: present
- update_cache: yes
- name:
- - nomad
- - consul \ No newline at end of file
diff --git a/os/config/roles/common/tasks/main.yml b/os/config/roles/common/tasks/main.yml
index b332414..781e891 100644
--- a/os/config/roles/common/tasks/main.yml
+++ b/os/config/roles/common/tasks/main.yml
@@ -6,7 +6,7 @@
- name: "Upgrade system"
apt:
- upgrade: dist # Should we do a full uprade instead of a dist one?
+ upgrade: full
update_cache: yes
cache_valid_time: 3600
autoclean: yes
@@ -34,18 +34,15 @@
- strace
- tcpdump
# Networking
- - dnsutils # now called bind9-dnsutils (still valid)
+ - bind9-dnsutils
- ethtool
- iproute2 # advanced net-tools
- iptables # legacy firewall (still used by diplonat)
- iptables-persistent
- net-tools # basic network tools
- nftables # iptables' successor (will replace it eventually)
- # Optional / Dispensable
- #- docker.io # Adrien n'approuve pas (il faut utiliser le repo Docker)
+ # Filesystems / Disk Utils
- parted
- #- btrfs-tools
- #- libnss-resolve # provides DNS/LLMNR utilities via systemd-resolved
state: present
# Install Docker if need be
@@ -62,20 +59,6 @@
include_tasks: docker.yml
when: docker_exists.rc != 0
-# Install Nomad & Consul if need be
-
-- name: Check if Nomad is installed
- command: 'which nomad'
- args:
- warn: no
- register: nomad_exists
- changed_when: nomad_exists.rc != 0
- ignore_errors: true
-
-- name: "Install Nomad & Consul"
- include_tasks: hashicorp.yml
- when: nomad_exists.rc != 0
-
# Cool stuff
- name: "Passwordless sudo"
@@ -84,4 +67,4 @@
state: present
regexp: '^%sudo'
line: '%sudo ALL=(ALL) NOPASSWD: ALL'
- validate: 'visudo -cf %s' \ No newline at end of file
+ validate: 'visudo -cf %s'