From 22e559d769174e8fd72f5852513d5cea8ed9fa99 Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Tue, 10 Mar 2015 10:30:50 -0400
Subject: [PATCH] Provision network before kubelet

---
 cluster/saltbase/salt/kubelet/init.sls |  3 +++
 cluster/saltbase/salt/top.sls          | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cluster/saltbase/salt/kubelet/init.sls b/cluster/saltbase/salt/kubelet/init.sls
index f6b7addc8db..4c2d6a46cbb 100644
--- a/cluster/saltbase/salt/kubelet/init.sls
+++ b/cluster/saltbase/salt/kubelet/init.sls
@@ -72,3 +72,6 @@ kubelet:
       - file: /etc/init.d/kubelet
 {% endif %}
       - file: /var/lib/kubelet/kubernetes_auth
+{% if pillar.get('enable_node_monitoring', '').lower() == 'true' %}
+      - file: /etc/kubernetes/manifests/cadvisor.manifest
+{% endif %}
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index 273f177d345..cbca19b2331 100644
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -6,6 +6,11 @@ base:
   'roles:kubernetes-pool':
     - match: grain
     - docker
+{% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
+    - openvpn-client
+{% else %}
+    - sdn
+{% endif %}
     - kubelet
     - kube-proxy
 {% if pillar.get('enable_node_monitoring', '').lower() == 'true' %}
@@ -20,11 +25,6 @@ base:
   {% endif %}
 {% endif %}
     - logrotate
-{% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
-    - openvpn-client
-{% else %}
-    - sdn
-{% endif %}
     - monit
 
   'roles:kubernetes-master':