Move base roles into a base subdir

If we move these into a subdir, it cleans up the number of things we nave to files match on. Stop running disable-puppet-agent in base. We run it in run-puppet which should be fine. Change-Id: Ia16adb96b11d25a097490882c4c59a50a0b7b23d
2020-05-26 14:24:20 -05:00 · 2020-05-26 14:24:20 -05:00 · e8716e742e
commit e8716e742e
parent 67212c3ef2
83 changed files with 11 additions and 18 deletions
--- a/playbooks/base.yaml
+++ b/playbooks/base.yaml
@ -1,12 +1,11 @@
 - hosts: "!disabled"
  name: "Base: set up common environment on all hosts"
  roles:
-    - users
+    - base/users
-    - base-repos
+    - base/repos
-    - base-server
+    - base/server
-    - timezone
+    - base/timezone
-    - unbound
+    - base/unbound
-    - exim
+    - base/exim
-    - disable-puppet-agent
+    - base/snmpd
-    - snmpd
+    - base/iptables
    - iptables
--- a/playbooks/roles/base/README.rst
+++ b/playbooks/roles/base/README.rst
@ -0,0 +1 @@
 Directory to hold base roles.
--- a/playbooks/roles/base/exim/README.rst
+++ b/playbooks/roles/base/exim/README.rst
--- a/playbooks/roles/base/exim/defaults/main.yaml
+++ b/playbooks/roles/base/exim/defaults/main.yaml
--- a/playbooks/roles/base/exim/handlers/main.yaml
+++ b/playbooks/roles/base/exim/handlers/main.yaml
--- a/playbooks/roles/base/exim/tasks/Debian.yaml
+++ b/playbooks/roles/base/exim/tasks/Debian.yaml
--- a/playbooks/roles/base/exim/tasks/RedHat.yaml
+++ b/playbooks/roles/base/exim/tasks/RedHat.yaml
--- a/playbooks/roles/base/exim/tasks/default.yaml
+++ b/playbooks/roles/base/exim/tasks/default.yaml
--- a/playbooks/roles/base/exim/tasks/main.yaml
+++ b/playbooks/roles/base/exim/tasks/main.yaml
--- a/playbooks/roles/base/exim/templates/aliases.j2
+++ b/playbooks/roles/base/exim/templates/aliases.j2
--- a/playbooks/roles/base/exim/templates/exim.sysconfig.j2
+++ b/playbooks/roles/base/exim/templates/exim.sysconfig.j2
--- a/playbooks/roles/base/exim/templates/exim4.conf.j2
+++ b/playbooks/roles/base/exim/templates/exim4.conf.j2
--- a/playbooks/roles/base/exim/templates/exim4.default.j2
+++ b/playbooks/roles/base/exim/templates/exim4.default.j2
--- a/playbooks/roles/base/exim/vars/Debian.yaml
+++ b/playbooks/roles/base/exim/vars/Debian.yaml
--- a/playbooks/roles/base/exim/vars/RedHat.yaml
+++ b/playbooks/roles/base/exim/vars/RedHat.yaml
--- a/playbooks/roles/base/iptables/README.rst
+++ b/playbooks/roles/base/iptables/README.rst
--- a/playbooks/roles/base/iptables/defaults/main.yaml
+++ b/playbooks/roles/base/iptables/defaults/main.yaml
--- a/playbooks/roles/base/iptables/handlers/main.yaml
+++ b/playbooks/roles/base/iptables/handlers/main.yaml
--- a/playbooks/roles/base/iptables/tasks/RedHat.yaml
+++ b/playbooks/roles/base/iptables/tasks/RedHat.yaml
--- a/playbooks/roles/base/iptables/tasks/main.yaml
+++ b/playbooks/roles/base/iptables/tasks/main.yaml
--- a/playbooks/roles/base/iptables/templates/rules.v4.j2
+++ b/playbooks/roles/base/iptables/templates/rules.v4.j2
--- a/playbooks/roles/base/iptables/templates/rules.v6.j2
+++ b/playbooks/roles/base/iptables/templates/rules.v6.j2
--- a/playbooks/roles/base/iptables/vars/Debian.yaml
+++ b/playbooks/roles/base/iptables/vars/Debian.yaml
--- a/playbooks/roles/base/iptables/vars/RedHat.yaml
+++ b/playbooks/roles/base/iptables/vars/RedHat.yaml
--- a/playbooks/roles/base/iptables/vars/Ubuntu.trusty.yaml
+++ b/playbooks/roles/base/iptables/vars/Ubuntu.trusty.yaml
--- a/playbooks/roles/base/repos/README.rst
+++ b/playbooks/roles/base/repos/README.rst
--- a/playbooks/roles/base/repos/files/80retry
+++ b/playbooks/roles/base/repos/files/80retry
--- a/playbooks/roles/base/repos/files/90no-translations
+++ b/playbooks/roles/base/repos/files/90no-translations
--- a/playbooks/roles/base/repos/files/sources.list.bionic.aarch64
+++ b/playbooks/roles/base/repos/files/sources.list.bionic.aarch64
--- a/playbooks/roles/base/repos/files/sources.list.bionic.x86_64
+++ b/playbooks/roles/base/repos/files/sources.list.bionic.x86_64
--- a/playbooks/roles/base/repos/files/sources.list.focal.x86_64
+++ b/playbooks/roles/base/repos/files/sources.list.focal.x86_64
--- a/playbooks/roles/base/repos/files/sources.list.trusty.x86_64
+++ b/playbooks/roles/base/repos/files/sources.list.trusty.x86_64
--- a/playbooks/roles/base/repos/files/sources.list.xenial.aarch64
+++ b/playbooks/roles/base/repos/files/sources.list.xenial.aarch64
--- a/playbooks/roles/base/repos/files/sources.list.xenial.x86_64
+++ b/playbooks/roles/base/repos/files/sources.list.xenial.x86_64
--- a/playbooks/roles/base/repos/handlers/main.yaml
+++ b/playbooks/roles/base/repos/handlers/main.yaml
--- a/playbooks/roles/base/repos/tasks/CentOS.yaml
+++ b/playbooks/roles/base/repos/tasks/CentOS.yaml
--- a/playbooks/roles/base/repos/tasks/Debian.yaml
+++ b/playbooks/roles/base/repos/tasks/Debian.yaml
--- a/playbooks/roles/base/repos/tasks/main.yaml
+++ b/playbooks/roles/base/repos/tasks/main.yaml
--- a/playbooks/roles/base/server/README.rst
+++ b/playbooks/roles/base/server/README.rst
--- a/playbooks/roles/base/server/defaults/main.yaml
+++ b/playbooks/roles/base/server/defaults/main.yaml
--- a/playbooks/roles/base/server/files/10periodic
+++ b/playbooks/roles/base/server/files/10periodic
--- a/playbooks/roles/base/server/files/50unattended-upgrades
+++ b/playbooks/roles/base/server/files/50unattended-upgrades
--- a/playbooks/roles/base/server/files/95disable-recommends
+++ b/playbooks/roles/base/server/files/95disable-recommends
--- a/playbooks/roles/base/server/files/bash-history.sh
+++ b/playbooks/roles/base/server/files/bash-history.sh
--- a/playbooks/roles/base/server/files/debian_limits.conf
+++ b/playbooks/roles/base/server/files/debian_limits.conf
--- a/playbooks/roles/base/server/files/rsyslog.d_50-default.conf
+++ b/playbooks/roles/base/server/files/rsyslog.d_50-default.conf
--- a/playbooks/roles/base/server/files/yum/yum-cron.conf
+++ b/playbooks/roles/base/server/files/yum/yum-cron.conf
--- a/playbooks/roles/base/server/handlers/main.yaml
+++ b/playbooks/roles/base/server/handlers/main.yaml
--- a/playbooks/roles/base/server/tasks/Debian.yaml
+++ b/playbooks/roles/base/server/tasks/Debian.yaml
--- a/playbooks/roles/base/server/tasks/RedHat.yaml
+++ b/playbooks/roles/base/server/tasks/RedHat.yaml
--- a/playbooks/roles/base/server/tasks/Ubuntu.xenial.aarch64.yaml
+++ b/playbooks/roles/base/server/tasks/Ubuntu.xenial.aarch64.yaml
--- a/playbooks/roles/base/server/tasks/main.yaml
+++ b/playbooks/roles/base/server/tasks/main.yaml
--- a/playbooks/roles/base/server/templates/sshd_config.j2
+++ b/playbooks/roles/base/server/templates/sshd_config.j2
--- a/playbooks/roles/base/server/vars/Debian.yaml
+++ b/playbooks/roles/base/server/vars/Debian.yaml
--- a/playbooks/roles/base/server/vars/RedHat.yaml
+++ b/playbooks/roles/base/server/vars/RedHat.yaml
--- a/playbooks/roles/base/server/vars/Ubuntu.trusty.yaml
+++ b/playbooks/roles/base/server/vars/Ubuntu.trusty.yaml
--- a/playbooks/roles/base/server/vars/Ubuntu.xenial.yaml
+++ b/playbooks/roles/base/server/vars/Ubuntu.xenial.yaml
--- a/playbooks/roles/base/snmpd/README.rst
+++ b/playbooks/roles/base/snmpd/README.rst
--- a/playbooks/roles/base/snmpd/handlers/main.yaml
+++ b/playbooks/roles/base/snmpd/handlers/main.yaml
--- a/playbooks/roles/base/snmpd/tasks/main.yaml
+++ b/playbooks/roles/base/snmpd/tasks/main.yaml
--- a/playbooks/roles/base/snmpd/templates/snmpd.conf
+++ b/playbooks/roles/base/snmpd/templates/snmpd.conf
--- a/playbooks/roles/base/snmpd/vars/Debian.yaml
+++ b/playbooks/roles/base/snmpd/vars/Debian.yaml
--- a/playbooks/roles/base/snmpd/vars/RedHat.yaml
+++ b/playbooks/roles/base/snmpd/vars/RedHat.yaml
--- a/playbooks/roles/base/timezone/README.rst
+++ b/playbooks/roles/base/timezone/README.rst
--- a/playbooks/roles/base/timezone/handlers/main.yaml
+++ b/playbooks/roles/base/timezone/handlers/main.yaml
--- a/playbooks/roles/base/timezone/tasks/main.yaml
+++ b/playbooks/roles/base/timezone/tasks/main.yaml
--- a/playbooks/roles/base/timezone/vars/Debian.yaml
+++ b/playbooks/roles/base/timezone/vars/Debian.yaml
--- a/playbooks/roles/base/timezone/vars/RedHat.yaml
+++ b/playbooks/roles/base/timezone/vars/RedHat.yaml
--- a/playbooks/roles/base/unbound/README.rst
+++ b/playbooks/roles/base/unbound/README.rst
--- a/playbooks/roles/base/unbound/files/dhclient.conf
+++ b/playbooks/roles/base/unbound/files/dhclient.conf
--- a/playbooks/roles/base/unbound/files/resolv.conf
+++ b/playbooks/roles/base/unbound/files/resolv.conf
--- a/playbooks/roles/base/unbound/files/unbound.default
+++ b/playbooks/roles/base/unbound/files/unbound.default
--- a/playbooks/roles/base/unbound/tasks/Debian.yaml
+++ b/playbooks/roles/base/unbound/tasks/Debian.yaml
--- a/playbooks/roles/base/unbound/tasks/dhclient.yaml
+++ b/playbooks/roles/base/unbound/tasks/dhclient.yaml
--- a/playbooks/roles/base/unbound/tasks/main.yaml
+++ b/playbooks/roles/base/unbound/tasks/main.yaml
--- a/playbooks/roles/base/users/README.rst
+++ b/playbooks/roles/base/users/README.rst
--- a/playbooks/roles/base/users/defaults/main.yaml
+++ b/playbooks/roles/base/users/defaults/main.yaml
--- a/playbooks/roles/base/users/files/Debian/login.defs
+++ b/playbooks/roles/base/users/files/Debian/login.defs
--- a/playbooks/roles/base/users/files/RedHat/login.defs
+++ b/playbooks/roles/base/users/files/RedHat/login.defs
--- a/playbooks/roles/base/users/files/sudoers
+++ b/playbooks/roles/base/users/files/sudoers
--- a/playbooks/roles/base/users/tasks/main.yaml
+++ b/playbooks/roles/base/users/tasks/main.yaml
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@ -58,14 +58,7 @@
      - playbooks/host_vars/
      - playbooks/group_vars/
      - playbooks/base.yaml
-      - playbooks/roles/users/
+      - playbooks/roles/base/
      - playbooks/roles/base-repos/
      - playbooks/roles/base-server/
      - playbooks/roles/timezone/
      - playbooks/roles/unbound/
      - playbooks/roles/exim/
      - playbooks/roles/snmpd/
      - playbooks/roles/iptables/
 - job:
    name: infra-prod-service-letsencrypt
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@ -223,7 +223,7 @@
      - playbooks/group_vars/puppet
      - playbooks/roles/run-puppet/
      - playbooks/roles/install-ansible-roles/
-      - roles/exim
+      - playbooks/roles/base/exim
    vars:
      run_playbooks:
        - playbooks/remote_puppet_else.yaml