From eb6025a18475d2d543f601dab0daf0b353023d70 Mon Sep 17 00:00:00 2001
From: ant31 <2t.antoine@gmail.com>
Date: Wed, 4 May 2016 18:00:46 +0200
Subject: [PATCH] Add kubedns as default package to install

---
 cluster.yml                           | 4 ++++
 inventory/group_vars/all.yml          | 8 ++++++++
 roles/kubernetes-apps/tasks/main.yaml | 3 +++
 3 files changed, 15 insertions(+)

diff --git a/cluster.yml b/cluster.yml
index 4ccef1963..0c75b21b9 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -14,3 +14,7 @@
 - hosts: k8s-cluster
   roles:
     - { role: dnsmasq, tags: dnsmasq }
+
+- hosts: kube-master[0]
+  roles:
+    - {role: kubernetes-apps, tags: apps}
diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index b73fb66b2..e82c83147 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -134,3 +134,11 @@ dns_server: "{{ kube_service_addresses|ipaddr('net')|ipaddr(2)|ipaddr('address')
 ## An obvious use case is allowing insecure-registry access
 ## to self hosted registries like so:
 docker_options: "--insecure-registry={{ kube_service_addresses }}"
+
+# default packages to install within the cluster
+kpm_packages:
+  - name: kube-system/kubedns
+    namespace: kube-system
+    variables:
+      cluster_ip: "{{skydns_server}}"
+#  - name: kube-system/grafana
diff --git a/roles/kubernetes-apps/tasks/main.yaml b/roles/kubernetes-apps/tasks/main.yaml
index c74761dfc..315c880ef 100644
--- a/roles/kubernetes-apps/tasks/main.yaml
+++ b/roles/kubernetes-apps/tasks/main.yaml
@@ -1,3 +1,6 @@
+- name: install kpm
+  pip: name=kpm state=latest
+
 - name: manage kubernetes applications
   kpm:
     namespace: "{{item.namespace | default(kpm_namespace | default('default'))}}"