From abb754c00d479e4a4a98d82b497dbcd073251a69 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Tue, 5 Aug 2014 15:10:17 -0700
Subject: [PATCH] Install nsinit on hosts.

---
 cluster/saltbase/salt/nsinit/init.sls   |  5 +++++
 cluster/saltbase/salt/nsinit/install.sh | 23 +++++++++++++++++++++++
 cluster/saltbase/salt/top.sls           |  1 +
 3 files changed, 29 insertions(+)
 create mode 100644 cluster/saltbase/salt/nsinit/init.sls
 create mode 100644 cluster/saltbase/salt/nsinit/install.sh

diff --git a/cluster/saltbase/salt/nsinit/init.sls b/cluster/saltbase/salt/nsinit/init.sls
new file mode 100644
index 00000000000..712112bc301
--- /dev/null
+++ b/cluster/saltbase/salt/nsinit/init.sls
@@ -0,0 +1,5 @@
+nsinit:
+  cmd.script:
+    - user: root
+    - shell: /bin/bash
+    - source: salt://nsinit/install.sh
diff --git a/cluster/saltbase/salt/nsinit/install.sh b/cluster/saltbase/salt/nsinit/install.sh
new file mode 100644
index 00000000000..d553c628a57
--- /dev/null
+++ b/cluster/saltbase/salt/nsinit/install.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Copyright 2014 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+export GOPATH=/var/nsinit
+mkdir -p $GOPATH
+apt-get install -y -qq build-essential
+go get github.com/docker/libcontainer/nsinit/nsinit
+if [ ! -e /usr/sbin/nsinit ]; then
+  ln -s /var/nsinit/bin/nsinit /usr/sbin/nsinit
+fi
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index 4a083c3678f..f6d51278e4c 100644
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -9,6 +9,7 @@ base:
     - kubelet
     - kube-proxy
     - cadvisor
+    - nsinit
 
   'roles:kubernetes-master':
     - match: grain