Consolidate Pi playbooks

playbooks/pik8s.yml

@@ -1,18 +0,0 @@
-#!/usr/bin/env ansible-playbook
-# vim:ft=ansible:
----
-- hosts: pik8s
-  roles:
-    - role: k8s
-      tags: [ k8s, skip-pull ]
-    - role: motd
-      vars:
-        motd_watch_services_extra:
-          - docker
-          - kubelet
-      tags: [ k8s, motd ]
-- hosts: pik8s_masters
-  tasks:
-    - name: install openshift
-      pip: name=openshift state=latest
-      tags: [ k8s, packages, pip ]

playbooks/pis.yml

@@ -7,3 +7,18 @@
       tags: [ pis, zerotier ]
     - role: docker
       tags: [ pis, docker, skip-pull ]
+- hosts: pik8s
+  roles:
+    - role: k8s
+      tags: [ k8s, skip-pull ]
+    - role: motd
+      vars:
+        motd_watch_services_extra:
+          - docker
+          - kubelet
+      tags: [ k8s, motd ]
+- hosts: pik8s_masters
+  tasks:
+    - name: install openshift
+      pip: name=openshift state=latest
+      tags: [ k8s, packages, pip ]

site.yml

@@ -21,5 +21,4 @@
 - import_playbook: playbooks/web.yml
 - import_playbook: playbooks/game.yml
 - import_playbook: playbooks/pis.yml
-- import_playbook: playbooks/pik8s.yml
 - import_playbook: playbooks/desktop.yml