Move motd configuration to Ubuntu machines and only Ubuntu machines

This commit is contained in:
Salt 2021-11-06 15:53:57 -05:00
parent ea2e98e6ae
commit 635c8c1bf4
4 changed files with 20 additions and 10 deletions

View File

@ -10,8 +10,9 @@ token: !vault |
api_endpoint: "https://netbox.desu.ltd" api_endpoint: "https://netbox.desu.ltd"
group_by: group_by:
- device_roles - device_roles
- tags
- device_types - device_types
- manufacturers - manufacturers
- platforms
- tags
device_query_filters: device_query_filters:
- has_primary_ip: "true" - has_primary_ip: "true"

View File

@ -12,15 +12,6 @@
tags: [ common ] tags: [ common ]
- role: adminuser - role: adminuser
tags: [ adminuser, common ] tags: [ adminuser, common ]
- role: geerlingguy.docker
tags: [ docker, common, skip-pull ]
- role: motd
vars:
motd_watch_services_extra:
- docker
- kubelet
- postgresql
tags: [ motd, common ]
- role: willshersystems.sshd - role: willshersystems.sshd
vars: vars:
sshd: sshd:
@ -35,3 +26,7 @@
UsePAM: yes UsePAM: yes
X11Forwarding: no X11Forwarding: no
tags: [ sshd, common ] tags: [ sshd, common ]
- hosts: all:!tags_no_docker
roles:
- role: geerlingguy.docker
tags: [ docker, common, skip-pull ]

12
playbooks/platforms_ub2004.yml Executable file
View File

@ -0,0 +1,12 @@
#!/usr/bin/env ansible-playbook
# vim:ft=ansible:
---
- hosts: platforms_ub2004
roles:
- role: motd
vars:
motd_watch_services_extra:
- docker
- kubelet
- postgresql
tags: [ motd, common ]

View File

@ -3,6 +3,8 @@
--- ---
# Preambulatory system configuration # Preambulatory system configuration
- import_playbook: playbooks/all.yml - import_playbook: playbooks/all.yml
# Platform configuration
- import_playbook: playbooks/platforms_ub2004.yml
# Manufacturer configuration # Manufacturer configuration
- import_playbook: playbooks/manufacturers_raspi.yml - import_playbook: playbooks/manufacturers_raspi.yml
- import_playbook: playbooks/manufacturers_s76.yml - import_playbook: playbooks/manufacturers_s76.yml