commit 989d6db4a713b8bc3e4af0022fb0768fee60986d
author Jenkins <jenkins@review.openstack.org> Tue Jan 24 22:08:28 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 24 22:08:28 2017 +0000
tree 421960c096a6bd41bc428f143e574d5edef2d63a
parent d79276d318713a95a634bac960f316425a7a19ab
parent 398e9267b831acfdb857415c1dd4752fb24b7f6c

Merge "allow to pass options to dnsmasq service"

kubernetes/_common.sls

diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index 9defea0..347048f 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -19,11 +19,6 @@
 {%- endif %}
 
 {%- if common.hyperkube %}
-/root/.bashrc:
-  file.append:
-    - text: alias kubectl="hyperkube kubectl"
-    - makedirs: True
-
 /tmp/hyperkube:
   file.directory:
     - user: root
@@ -49,6 +44,12 @@
      - require:
        - dockerng: hyperkube-copy
 
+/usr/bin/kubectl:
+  file.symlink:
+    - target: /usr/bin/hyperkube
+    - require:
+      - file: /usr/bin/hyperkube
+
 /etc/systemd/system/kubelet.service:
   file.managed:
   - source: salt://kubernetes/files/systemd/kubelet.service