diff options
| author | LUXEY Adrien <adrien.luxey@inria.fr> | 2021-03-23 17:12:13 +0100 |
|---|---|---|
| committer | LUXEY Adrien <adrien.luxey@inria.fr> | 2021-03-23 17:12:13 +0100 |
| commit | 89b87407818c78852b2c99b4300053e34e255fa5 (patch) | |
| tree | 6f01077419616a79bd0c09ac490d89773a52531f | |
| parent | 6f09e7de1c053ff33daad161b5e62e6b31638c53 (diff) | |
| download | infrastructure-89b87407818c78852b2c99b4300053e34e255fa5.tar.gz infrastructure-89b87407818c78852b2c99b4300053e34e255fa5.zip | |
Ansible config cleanup
| -rw-r--r-- | os/config/roles/common/tasks/main.yml | 4 | ||||
| -rw-r--r-- | os/config/roles/consul/tasks/main.yml | 12 | ||||
| -rw-r--r-- | os/config/roles/consul/vars/.gitignore | 1 | ||||
| -rw-r--r-- | os/config/roles/consul/vars/main.yml.sample | 2 | ||||
| -rw-r--r-- | os/config/roles/nomad/tasks/main.yml | 12 |
5 files changed, 2 insertions, 29 deletions
diff --git a/os/config/roles/common/tasks/main.yml b/os/config/roles/common/tasks/main.yml index 37cad52..b332414 100644 --- a/os/config/roles/common/tasks/main.yml +++ b/os/config/roles/common/tasks/main.yml @@ -34,7 +34,7 @@ - strace - tcpdump # Networking - - dnsutils # now called bind9-dnsutils + - dnsutils # now called bind9-dnsutils (still valid) - ethtool - iproute2 # advanced net-tools - iptables # legacy firewall (still used by diplonat) @@ -76,7 +76,7 @@ include_tasks: hashicorp.yml when: nomad_exists.rc != 0 - +# Cool stuff - name: "Passwordless sudo" lineinfile: diff --git a/os/config/roles/consul/tasks/main.yml b/os/config/roles/consul/tasks/main.yml index da6f6f1..bdbf295 100644 --- a/os/config/roles/consul/tasks/main.yml +++ b/os/config/roles/consul/tasks/main.yml @@ -1,15 +1,3 @@ -# - name: "Set consul version" -# set_fact: -# consul_version: 1.9.1 - -# - name: "Download and install Consul for x86_64" -# unarchive: -# src: "https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_amd64.zip" -# dest: /usr/local/bin -# remote_src: yes -# when: -# - "ansible_architecture == 'x86_64'" - - name: "Create consul configuration directory" file: path=/etc/consul/ state=directory diff --git a/os/config/roles/consul/vars/.gitignore b/os/config/roles/consul/vars/.gitignore deleted file mode 100644 index ff5c0bd..0000000 --- a/os/config/roles/consul/vars/.gitignore +++ /dev/null @@ -1 +0,0 @@ -main.yml diff --git a/os/config/roles/consul/vars/main.yml.sample b/os/config/roles/consul/vars/main.yml.sample deleted file mode 100644 index 9c44126..0000000 --- a/os/config/roles/consul/vars/main.yml.sample +++ /dev/null @@ -1,2 +0,0 @@ ---- -consul_gossip_encrypt: "<secret>" diff --git a/os/config/roles/nomad/tasks/main.yml b/os/config/roles/nomad/tasks/main.yml index 080a75f..c4f2876 100644 --- a/os/config/roles/nomad/tasks/main.yml +++ b/os/config/roles/nomad/tasks/main.yml @@ -1,15 +1,3 @@ -# - name: "Set nomad version" -# set_fact: -# nomad_version: 1.0.2 - -# - name: "Download and install Nomad for x86_64" -# unarchive: -# src: "https://releases.hashicorp.com/nomad/{{ nomad_version }}/nomad_{{ nomad_version }}_linux_amd64.zip" -# dest: /usr/local/bin -# remote_src: yes -# when: -# - "ansible_architecture == 'x86_64'" - - name: "Create Nomad configuration directory" file: path=/etc/nomad/ state=directory |