diff --git a/playbooks/base.yaml b/playbooks/base.yaml index 3ef04741e8..da326d1078 100644 --- 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-repos - - base-server - - timezone - - unbound - - exim - - disable-puppet-agent - - snmpd - - iptables + - base/users + - base/repos + - base/server + - base/timezone + - base/unbound + - base/exim + - base/snmpd + - base/iptables diff --git a/playbooks/roles/base/README.rst b/playbooks/roles/base/README.rst new file mode 100644 index 0000000000..984908bfe1 --- /dev/null +++ b/playbooks/roles/base/README.rst @@ -0,0 +1 @@ +Directory to hold base roles. diff --git a/roles/exim/README.rst b/playbooks/roles/base/exim/README.rst similarity index 100% rename from roles/exim/README.rst rename to playbooks/roles/base/exim/README.rst diff --git a/roles/exim/defaults/main.yaml b/playbooks/roles/base/exim/defaults/main.yaml similarity index 100% rename from roles/exim/defaults/main.yaml rename to playbooks/roles/base/exim/defaults/main.yaml diff --git a/roles/exim/handlers/main.yaml b/playbooks/roles/base/exim/handlers/main.yaml similarity index 100% rename from roles/exim/handlers/main.yaml rename to playbooks/roles/base/exim/handlers/main.yaml diff --git a/roles/exim/tasks/Debian.yaml b/playbooks/roles/base/exim/tasks/Debian.yaml similarity index 100% rename from roles/exim/tasks/Debian.yaml rename to playbooks/roles/base/exim/tasks/Debian.yaml diff --git a/roles/exim/tasks/RedHat.yaml b/playbooks/roles/base/exim/tasks/RedHat.yaml similarity index 100% rename from roles/exim/tasks/RedHat.yaml rename to playbooks/roles/base/exim/tasks/RedHat.yaml diff --git a/roles/exim/tasks/default.yaml b/playbooks/roles/base/exim/tasks/default.yaml similarity index 100% rename from roles/exim/tasks/default.yaml rename to playbooks/roles/base/exim/tasks/default.yaml diff --git a/roles/exim/tasks/main.yaml b/playbooks/roles/base/exim/tasks/main.yaml similarity index 100% rename from roles/exim/tasks/main.yaml rename to playbooks/roles/base/exim/tasks/main.yaml diff --git a/roles/exim/templates/aliases.j2 b/playbooks/roles/base/exim/templates/aliases.j2 similarity index 100% rename from roles/exim/templates/aliases.j2 rename to playbooks/roles/base/exim/templates/aliases.j2 diff --git a/roles/exim/templates/exim.sysconfig.j2 b/playbooks/roles/base/exim/templates/exim.sysconfig.j2 similarity index 100% rename from roles/exim/templates/exim.sysconfig.j2 rename to playbooks/roles/base/exim/templates/exim.sysconfig.j2 diff --git a/roles/exim/templates/exim4.conf.j2 b/playbooks/roles/base/exim/templates/exim4.conf.j2 similarity index 100% rename from roles/exim/templates/exim4.conf.j2 rename to playbooks/roles/base/exim/templates/exim4.conf.j2 diff --git a/roles/exim/templates/exim4.default.j2 b/playbooks/roles/base/exim/templates/exim4.default.j2 similarity index 100% rename from roles/exim/templates/exim4.default.j2 rename to playbooks/roles/base/exim/templates/exim4.default.j2 diff --git a/roles/exim/vars/Debian.yaml b/playbooks/roles/base/exim/vars/Debian.yaml similarity index 100% rename from roles/exim/vars/Debian.yaml rename to playbooks/roles/base/exim/vars/Debian.yaml diff --git a/roles/exim/vars/RedHat.yaml b/playbooks/roles/base/exim/vars/RedHat.yaml similarity index 100% rename from roles/exim/vars/RedHat.yaml rename to playbooks/roles/base/exim/vars/RedHat.yaml diff --git a/playbooks/roles/iptables/README.rst b/playbooks/roles/base/iptables/README.rst similarity index 100% rename from playbooks/roles/iptables/README.rst rename to playbooks/roles/base/iptables/README.rst diff --git a/playbooks/roles/iptables/defaults/main.yaml b/playbooks/roles/base/iptables/defaults/main.yaml similarity index 100% rename from playbooks/roles/iptables/defaults/main.yaml rename to playbooks/roles/base/iptables/defaults/main.yaml diff --git a/playbooks/roles/iptables/handlers/main.yaml b/playbooks/roles/base/iptables/handlers/main.yaml similarity index 100% rename from playbooks/roles/iptables/handlers/main.yaml rename to playbooks/roles/base/iptables/handlers/main.yaml diff --git a/playbooks/roles/iptables/tasks/RedHat.yaml b/playbooks/roles/base/iptables/tasks/RedHat.yaml similarity index 100% rename from playbooks/roles/iptables/tasks/RedHat.yaml rename to playbooks/roles/base/iptables/tasks/RedHat.yaml diff --git a/playbooks/roles/iptables/tasks/main.yaml b/playbooks/roles/base/iptables/tasks/main.yaml similarity index 100% rename from playbooks/roles/iptables/tasks/main.yaml rename to playbooks/roles/base/iptables/tasks/main.yaml diff --git a/playbooks/roles/iptables/templates/rules.v4.j2 b/playbooks/roles/base/iptables/templates/rules.v4.j2 similarity index 100% rename from playbooks/roles/iptables/templates/rules.v4.j2 rename to playbooks/roles/base/iptables/templates/rules.v4.j2 diff --git a/playbooks/roles/iptables/templates/rules.v6.j2 b/playbooks/roles/base/iptables/templates/rules.v6.j2 similarity index 100% rename from playbooks/roles/iptables/templates/rules.v6.j2 rename to playbooks/roles/base/iptables/templates/rules.v6.j2 diff --git a/playbooks/roles/iptables/vars/Debian.yaml b/playbooks/roles/base/iptables/vars/Debian.yaml similarity index 100% rename from playbooks/roles/iptables/vars/Debian.yaml rename to playbooks/roles/base/iptables/vars/Debian.yaml diff --git a/playbooks/roles/iptables/vars/RedHat.yaml b/playbooks/roles/base/iptables/vars/RedHat.yaml similarity index 100% rename from playbooks/roles/iptables/vars/RedHat.yaml rename to playbooks/roles/base/iptables/vars/RedHat.yaml diff --git a/playbooks/roles/iptables/vars/Ubuntu.trusty.yaml b/playbooks/roles/base/iptables/vars/Ubuntu.trusty.yaml similarity index 100% rename from playbooks/roles/iptables/vars/Ubuntu.trusty.yaml rename to playbooks/roles/base/iptables/vars/Ubuntu.trusty.yaml diff --git a/playbooks/roles/base-repos/README.rst b/playbooks/roles/base/repos/README.rst similarity index 100% rename from playbooks/roles/base-repos/README.rst rename to playbooks/roles/base/repos/README.rst diff --git a/playbooks/roles/base-repos/files/80retry b/playbooks/roles/base/repos/files/80retry similarity index 100% rename from playbooks/roles/base-repos/files/80retry rename to playbooks/roles/base/repos/files/80retry diff --git a/playbooks/roles/base-repos/files/90no-translations b/playbooks/roles/base/repos/files/90no-translations similarity index 100% rename from playbooks/roles/base-repos/files/90no-translations rename to playbooks/roles/base/repos/files/90no-translations diff --git a/playbooks/roles/base-repos/files/sources.list.bionic.aarch64 b/playbooks/roles/base/repos/files/sources.list.bionic.aarch64 similarity index 100% rename from playbooks/roles/base-repos/files/sources.list.bionic.aarch64 rename to playbooks/roles/base/repos/files/sources.list.bionic.aarch64 diff --git a/playbooks/roles/base-repos/files/sources.list.bionic.x86_64 b/playbooks/roles/base/repos/files/sources.list.bionic.x86_64 similarity index 100% rename from playbooks/roles/base-repos/files/sources.list.bionic.x86_64 rename to playbooks/roles/base/repos/files/sources.list.bionic.x86_64 diff --git a/playbooks/roles/base-repos/files/sources.list.focal.x86_64 b/playbooks/roles/base/repos/files/sources.list.focal.x86_64 similarity index 100% rename from playbooks/roles/base-repos/files/sources.list.focal.x86_64 rename to playbooks/roles/base/repos/files/sources.list.focal.x86_64 diff --git a/playbooks/roles/base-repos/files/sources.list.trusty.x86_64 b/playbooks/roles/base/repos/files/sources.list.trusty.x86_64 similarity index 100% rename from playbooks/roles/base-repos/files/sources.list.trusty.x86_64 rename to playbooks/roles/base/repos/files/sources.list.trusty.x86_64 diff --git a/playbooks/roles/base-repos/files/sources.list.xenial.aarch64 b/playbooks/roles/base/repos/files/sources.list.xenial.aarch64 similarity index 100% rename from playbooks/roles/base-repos/files/sources.list.xenial.aarch64 rename to playbooks/roles/base/repos/files/sources.list.xenial.aarch64 diff --git a/playbooks/roles/base-repos/files/sources.list.xenial.x86_64 b/playbooks/roles/base/repos/files/sources.list.xenial.x86_64 similarity index 100% rename from playbooks/roles/base-repos/files/sources.list.xenial.x86_64 rename to playbooks/roles/base/repos/files/sources.list.xenial.x86_64 diff --git a/playbooks/roles/base-repos/handlers/main.yaml b/playbooks/roles/base/repos/handlers/main.yaml similarity index 100% rename from playbooks/roles/base-repos/handlers/main.yaml rename to playbooks/roles/base/repos/handlers/main.yaml diff --git a/playbooks/roles/base-repos/tasks/CentOS.yaml b/playbooks/roles/base/repos/tasks/CentOS.yaml similarity index 100% rename from playbooks/roles/base-repos/tasks/CentOS.yaml rename to playbooks/roles/base/repos/tasks/CentOS.yaml diff --git a/playbooks/roles/base-repos/tasks/Debian.yaml b/playbooks/roles/base/repos/tasks/Debian.yaml similarity index 100% rename from playbooks/roles/base-repos/tasks/Debian.yaml rename to playbooks/roles/base/repos/tasks/Debian.yaml diff --git a/playbooks/roles/base-repos/tasks/main.yaml b/playbooks/roles/base/repos/tasks/main.yaml similarity index 100% rename from playbooks/roles/base-repos/tasks/main.yaml rename to playbooks/roles/base/repos/tasks/main.yaml diff --git a/playbooks/roles/base-server/README.rst b/playbooks/roles/base/server/README.rst similarity index 100% rename from playbooks/roles/base-server/README.rst rename to playbooks/roles/base/server/README.rst diff --git a/playbooks/roles/base-server/defaults/main.yaml b/playbooks/roles/base/server/defaults/main.yaml similarity index 100% rename from playbooks/roles/base-server/defaults/main.yaml rename to playbooks/roles/base/server/defaults/main.yaml diff --git a/playbooks/roles/base-server/files/10periodic b/playbooks/roles/base/server/files/10periodic similarity index 100% rename from playbooks/roles/base-server/files/10periodic rename to playbooks/roles/base/server/files/10periodic diff --git a/playbooks/roles/base-server/files/50unattended-upgrades b/playbooks/roles/base/server/files/50unattended-upgrades similarity index 100% rename from playbooks/roles/base-server/files/50unattended-upgrades rename to playbooks/roles/base/server/files/50unattended-upgrades diff --git a/playbooks/roles/base-server/files/95disable-recommends b/playbooks/roles/base/server/files/95disable-recommends similarity index 100% rename from playbooks/roles/base-server/files/95disable-recommends rename to playbooks/roles/base/server/files/95disable-recommends diff --git a/playbooks/roles/base-server/files/bash-history.sh b/playbooks/roles/base/server/files/bash-history.sh similarity index 100% rename from playbooks/roles/base-server/files/bash-history.sh rename to playbooks/roles/base/server/files/bash-history.sh diff --git a/playbooks/roles/base-server/files/debian_limits.conf b/playbooks/roles/base/server/files/debian_limits.conf similarity index 100% rename from playbooks/roles/base-server/files/debian_limits.conf rename to playbooks/roles/base/server/files/debian_limits.conf diff --git a/playbooks/roles/base-server/files/rsyslog.d_50-default.conf b/playbooks/roles/base/server/files/rsyslog.d_50-default.conf similarity index 100% rename from playbooks/roles/base-server/files/rsyslog.d_50-default.conf rename to playbooks/roles/base/server/files/rsyslog.d_50-default.conf diff --git a/playbooks/roles/base-server/files/yum/yum-cron.conf b/playbooks/roles/base/server/files/yum/yum-cron.conf similarity index 100% rename from playbooks/roles/base-server/files/yum/yum-cron.conf rename to playbooks/roles/base/server/files/yum/yum-cron.conf diff --git a/playbooks/roles/base-server/handlers/main.yaml b/playbooks/roles/base/server/handlers/main.yaml similarity index 100% rename from playbooks/roles/base-server/handlers/main.yaml rename to playbooks/roles/base/server/handlers/main.yaml diff --git a/playbooks/roles/base-server/tasks/Debian.yaml b/playbooks/roles/base/server/tasks/Debian.yaml similarity index 100% rename from playbooks/roles/base-server/tasks/Debian.yaml rename to playbooks/roles/base/server/tasks/Debian.yaml diff --git a/playbooks/roles/base-server/tasks/RedHat.yaml b/playbooks/roles/base/server/tasks/RedHat.yaml similarity index 100% rename from playbooks/roles/base-server/tasks/RedHat.yaml rename to playbooks/roles/base/server/tasks/RedHat.yaml diff --git a/playbooks/roles/base-server/tasks/Ubuntu.xenial.aarch64.yaml b/playbooks/roles/base/server/tasks/Ubuntu.xenial.aarch64.yaml similarity index 100% rename from playbooks/roles/base-server/tasks/Ubuntu.xenial.aarch64.yaml rename to playbooks/roles/base/server/tasks/Ubuntu.xenial.aarch64.yaml diff --git a/playbooks/roles/base-server/tasks/main.yaml b/playbooks/roles/base/server/tasks/main.yaml similarity index 100% rename from playbooks/roles/base-server/tasks/main.yaml rename to playbooks/roles/base/server/tasks/main.yaml diff --git a/playbooks/roles/base-server/templates/sshd_config.j2 b/playbooks/roles/base/server/templates/sshd_config.j2 similarity index 100% rename from playbooks/roles/base-server/templates/sshd_config.j2 rename to playbooks/roles/base/server/templates/sshd_config.j2 diff --git a/playbooks/roles/base-server/vars/Debian.yaml b/playbooks/roles/base/server/vars/Debian.yaml similarity index 100% rename from playbooks/roles/base-server/vars/Debian.yaml rename to playbooks/roles/base/server/vars/Debian.yaml diff --git a/playbooks/roles/base-server/vars/RedHat.yaml b/playbooks/roles/base/server/vars/RedHat.yaml similarity index 100% rename from playbooks/roles/base-server/vars/RedHat.yaml rename to playbooks/roles/base/server/vars/RedHat.yaml diff --git a/playbooks/roles/base-server/vars/Ubuntu.trusty.yaml b/playbooks/roles/base/server/vars/Ubuntu.trusty.yaml similarity index 100% rename from playbooks/roles/base-server/vars/Ubuntu.trusty.yaml rename to playbooks/roles/base/server/vars/Ubuntu.trusty.yaml diff --git a/playbooks/roles/base-server/vars/Ubuntu.xenial.yaml b/playbooks/roles/base/server/vars/Ubuntu.xenial.yaml similarity index 100% rename from playbooks/roles/base-server/vars/Ubuntu.xenial.yaml rename to playbooks/roles/base/server/vars/Ubuntu.xenial.yaml diff --git a/playbooks/roles/snmpd/README.rst b/playbooks/roles/base/snmpd/README.rst similarity index 100% rename from playbooks/roles/snmpd/README.rst rename to playbooks/roles/base/snmpd/README.rst diff --git a/playbooks/roles/snmpd/handlers/main.yaml b/playbooks/roles/base/snmpd/handlers/main.yaml similarity index 100% rename from playbooks/roles/snmpd/handlers/main.yaml rename to playbooks/roles/base/snmpd/handlers/main.yaml diff --git a/playbooks/roles/snmpd/tasks/main.yaml b/playbooks/roles/base/snmpd/tasks/main.yaml similarity index 100% rename from playbooks/roles/snmpd/tasks/main.yaml rename to playbooks/roles/base/snmpd/tasks/main.yaml diff --git a/playbooks/roles/snmpd/templates/snmpd.conf b/playbooks/roles/base/snmpd/templates/snmpd.conf similarity index 100% rename from playbooks/roles/snmpd/templates/snmpd.conf rename to playbooks/roles/base/snmpd/templates/snmpd.conf diff --git a/playbooks/roles/snmpd/vars/Debian.yaml b/playbooks/roles/base/snmpd/vars/Debian.yaml similarity index 100% rename from playbooks/roles/snmpd/vars/Debian.yaml rename to playbooks/roles/base/snmpd/vars/Debian.yaml diff --git a/playbooks/roles/snmpd/vars/RedHat.yaml b/playbooks/roles/base/snmpd/vars/RedHat.yaml similarity index 100% rename from playbooks/roles/snmpd/vars/RedHat.yaml rename to playbooks/roles/base/snmpd/vars/RedHat.yaml diff --git a/playbooks/roles/timezone/README.rst b/playbooks/roles/base/timezone/README.rst similarity index 100% rename from playbooks/roles/timezone/README.rst rename to playbooks/roles/base/timezone/README.rst diff --git a/playbooks/roles/timezone/handlers/main.yaml b/playbooks/roles/base/timezone/handlers/main.yaml similarity index 100% rename from playbooks/roles/timezone/handlers/main.yaml rename to playbooks/roles/base/timezone/handlers/main.yaml diff --git a/playbooks/roles/timezone/tasks/main.yaml b/playbooks/roles/base/timezone/tasks/main.yaml similarity index 100% rename from playbooks/roles/timezone/tasks/main.yaml rename to playbooks/roles/base/timezone/tasks/main.yaml diff --git a/playbooks/roles/timezone/vars/Debian.yaml b/playbooks/roles/base/timezone/vars/Debian.yaml similarity index 100% rename from playbooks/roles/timezone/vars/Debian.yaml rename to playbooks/roles/base/timezone/vars/Debian.yaml diff --git a/playbooks/roles/timezone/vars/RedHat.yaml b/playbooks/roles/base/timezone/vars/RedHat.yaml similarity index 100% rename from playbooks/roles/timezone/vars/RedHat.yaml rename to playbooks/roles/base/timezone/vars/RedHat.yaml diff --git a/playbooks/roles/unbound/README.rst b/playbooks/roles/base/unbound/README.rst similarity index 100% rename from playbooks/roles/unbound/README.rst rename to playbooks/roles/base/unbound/README.rst diff --git a/playbooks/roles/unbound/files/dhclient.conf b/playbooks/roles/base/unbound/files/dhclient.conf similarity index 100% rename from playbooks/roles/unbound/files/dhclient.conf rename to playbooks/roles/base/unbound/files/dhclient.conf diff --git a/playbooks/roles/unbound/files/resolv.conf b/playbooks/roles/base/unbound/files/resolv.conf similarity index 100% rename from playbooks/roles/unbound/files/resolv.conf rename to playbooks/roles/base/unbound/files/resolv.conf diff --git a/playbooks/roles/unbound/files/unbound.default b/playbooks/roles/base/unbound/files/unbound.default similarity index 100% rename from playbooks/roles/unbound/files/unbound.default rename to playbooks/roles/base/unbound/files/unbound.default diff --git a/playbooks/roles/unbound/tasks/Debian.yaml b/playbooks/roles/base/unbound/tasks/Debian.yaml similarity index 100% rename from playbooks/roles/unbound/tasks/Debian.yaml rename to playbooks/roles/base/unbound/tasks/Debian.yaml diff --git a/playbooks/roles/unbound/tasks/dhclient.yaml b/playbooks/roles/base/unbound/tasks/dhclient.yaml similarity index 100% rename from playbooks/roles/unbound/tasks/dhclient.yaml rename to playbooks/roles/base/unbound/tasks/dhclient.yaml diff --git a/playbooks/roles/unbound/tasks/main.yaml b/playbooks/roles/base/unbound/tasks/main.yaml similarity index 100% rename from playbooks/roles/unbound/tasks/main.yaml rename to playbooks/roles/base/unbound/tasks/main.yaml diff --git a/playbooks/roles/users/README.rst b/playbooks/roles/base/users/README.rst similarity index 100% rename from playbooks/roles/users/README.rst rename to playbooks/roles/base/users/README.rst diff --git a/playbooks/roles/users/defaults/main.yaml b/playbooks/roles/base/users/defaults/main.yaml similarity index 100% rename from playbooks/roles/users/defaults/main.yaml rename to playbooks/roles/base/users/defaults/main.yaml diff --git a/playbooks/roles/users/files/Debian/login.defs b/playbooks/roles/base/users/files/Debian/login.defs similarity index 100% rename from playbooks/roles/users/files/Debian/login.defs rename to playbooks/roles/base/users/files/Debian/login.defs diff --git a/playbooks/roles/users/files/RedHat/login.defs b/playbooks/roles/base/users/files/RedHat/login.defs similarity index 100% rename from playbooks/roles/users/files/RedHat/login.defs rename to playbooks/roles/base/users/files/RedHat/login.defs diff --git a/playbooks/roles/users/files/sudoers b/playbooks/roles/base/users/files/sudoers similarity index 100% rename from playbooks/roles/users/files/sudoers rename to playbooks/roles/base/users/files/sudoers diff --git a/playbooks/roles/users/tasks/main.yaml b/playbooks/roles/base/users/tasks/main.yaml similarity index 100% rename from playbooks/roles/users/tasks/main.yaml rename to playbooks/roles/base/users/tasks/main.yaml diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml index 5a36d666e1..cb766be147 100644 --- 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-repos/ - - playbooks/roles/base-server/ - - playbooks/roles/timezone/ - - playbooks/roles/unbound/ - - playbooks/roles/exim/ - - playbooks/roles/snmpd/ - - playbooks/roles/iptables/ + - playbooks/roles/base/ - job: name: infra-prod-service-letsencrypt diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index b96d8bcefa..33da8699e5 100644 --- 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