Merge pull request #381 from kubespray/fixetcdstandalone

Fix etcd standalone deployment

roles/kubernetes/preinstall/defaults/main.yml

@@ -1,6 +1,27 @@
 ---
 run_gitinfos: false
 
+# This directory is where all the additional scripts go
+# that Kubernetes normally puts in /srv/kubernetes.
+# This puts them in a sane location
+kube_script_dir: "{{ bin_dir }}/kubernetes-scripts"
+
+# This directory is where all the additional config stuff goes
+# the kubernetes normally puts in /srv/kubernets.
+# This puts them in a sane location.
+# Editting this value will almost surely break something. Don't
+# change it. Things like the systemd scripts are hard coded to
+# look in here. Don't do it.
+kube_config_dir: /etc/kubernetes
+
+# Logging directory (sysvinit systems)
+kube_log_dir: "/var/log/kubernetes"
+
+# This is where you can drop yaml/json files and the kubelet will run those
+# pods on startup
+kube_manifest_dir: "{{ kube_config_dir }}/manifests"
+
+
 common_required_pkgs:
   - python-httplib2
   - openssl

roles/kubernetes/preinstall/tasks/main.yml

@@ -28,25 +28,28 @@
     path: "{{ kube_config_dir }}"
     state: directory
     owner: kube
+  when: "{{ inventory_hostname in groups['k8s-cluster'] }}"
 
 - name: Create kubernetes script directory
   file:
     path: "{{ kube_script_dir }}"
     state: directory
     owner: kube
+  when: "{{ inventory_hostname in groups['k8s-cluster'] }}"
 
 - name: Create kubernetes manifests directory
   file:
     path: "{{ kube_manifest_dir }}"
     state: directory
     owner: kube
+  when: "{{ inventory_hostname in groups['k8s-cluster'] }}"
 
 - name: Create kubernetes logs directory
   file:
     path: "{{ kube_log_dir }}"
     state: directory
     owner: kube
-  when: ansible_service_mgr in ["sysvinit","upstart"]
+  when: ansible_service_mgr in ["sysvinit","upstart"] and "{{ inventory_hostname in groups['k8s-cluster'] }}"
 
 - name: check cloud_provider value
   fail:
@@ -64,7 +67,7 @@
   with_items:
     - "/etc/cni/net.d"
     - "/opt/cni/bin"
-  when: kube_network_plugin in ["calico", "weave"]
+  when: kube_network_plugin in ["calico", "weave"] and "{{ inventory_hostname in groups['k8s-cluster'] }}"
 
 - name: Update package management cache (YUM)
   yum: update_cache=yes name='*'