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

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

playbooks/roles/base/README.rst

@@ -0,0 +1 @@
+Directory to hold base roles.

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

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