finalize merge kube_1.1.2

apps.yml

+---
+- hosts: kube-master
+  roles:
+    # System
+    - { role: apps/k8s-kubedns, tags: ['kubedns', 'apps'] }
+
+    # Databases
+    - { role: apps/k8s-postgres, tags: ['postgres', 'apps'] }
+    - { role: apps/k8s-elasticsearch, tags: ['es', 'apps'] }
+
+    # Monitoring
+    - { role: apps/k8s-influxdb, tags: ['influxdb', 'apps']}
+    - { role: apps/k8s-heapster, tags: ['heapster', 'apps']}
+    - { role: apps/k8s-kubedash, tags: ['kubedash', 'apps']}
+
+    # Console
+    - { role: apps/k8s-fabric8, tags: ['fabric8', 'apps'] }
+    - { role: apps/k8s-kube-ui, tags: ['kube-ui', 'apps'] }
\ No newline at end of file

cluster.yml

@@ -18,9 +18,3 @@
 - hosts: kube-node
   roles:
     - { role: kubernetes/node, tags: node }
-
-#- hosts: kube-master
-#  roles:
-    # Apps to be installed
-    # - { role: apps/k8s-kubedns, tags: ['kubedns', 'apps'] }
-    # - { role: apps/k8s-fabric8, tags: ['fabric8', 'apps'] }