first version of CoreOS on GCE

Please enter the commit message for your changes. Lines starting

roles/kubernetes/master/tasks/main.yml

@@ -3,6 +3,7 @@
   copy:
     src: kubectl_bash_completion.sh
     dest: /etc/bash_completion.d/kubectl.sh
+  when: ansible_os_family in ["Debian","RedHat"]
 
 - name: Copy kube-apiserver binary
   command: rsync -piu "{{ local_release_dir }}/kubernetes/bin/kube-apiserver" "{{ bin_dir }}/kube-apiserver"

roles/kubernetes/node/tasks/install.yml

@@ -18,12 +18,3 @@
   command: rsync -piu "{{ local_release_dir }}/kubernetes/bin/kubelet" "{{ bin_dir }}/kubelet"
   register: kubelet_copy
   changed_when: false
-
-- name: install | Calico-plugin | Directory
-  file: path=/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/ state=directory
-  when: kube_network_plugin == "calico"
-
-- name: install | Calico-plugin | Binary
-  command: rsync -piu "{{ local_release_dir }}/calico/bin/calico" "/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/calico"
-  when: kube_network_plugin == "calico"
-  changed_when: false

roles/kubernetes/preinstall/defaults/main.yml

@@ -8,5 +8,3 @@ common_required_pkgs:
   - rsync
   - bash-completion
 
-pypy_version: 2.4.0
-python_pypy_url: "https://bitbucket.org/pypy/pypy/downloads/pypy-{{ pypy_version }}.tar.bz2"

roles/kubernetes/preinstall/files/bootstrap.sh

@@ -1,29 +0,0 @@
-#/bin/bash
-set -e
-
-BINDIR="/usr/local/bin"
-
-cd $BINDIR
-
-if [[ -e $BINDIR/.bootstrapped ]]; then
-  exit 0
-fi
-
-PYPY_VERSION=2.4.0
-
-wget -O - https://bitbucket.org/pypy/pypy/downloads/pypy-$PYPY_VERSION-linux64.tar.bz2 |tar -xjf -
-mv -n pypy-$PYPY_VERSION-linux64 pypy
-
-## library fixup
-mkdir -p pypy/lib
-ln -snf /lib64/libncurses.so.5.9 $BINDIR/pypy/lib/libtinfo.so.5
-
-cat > $BINDIR/python <<EOF
-#!/bin/bash
-LD_LIBRARY_PATH=$BINDIR/pypy/lib:$LD_LIBRARY_PATH exec $BINDIR/pypy/bin/pypy "\$@"
-EOF
-
-chmod +x $BINDIR/python
-$BINDIR/python --version
-
-touch $BINDIR/.bootstrapped

roles/kubernetes/preinstall/files/runner

@@ -1,3 +0,0 @@
-#!/bin/bash
-BINDIR="/usr/local/bin"
-LD_LIBRARY_PATH=$BINDIR/pypy/lib:$LD_LIBRARY_PATH $BINDIR/pypy/bin/$(basename $0) $@

roles/kubernetes/preinstall/tasks/main.yml

@@ -14,6 +14,12 @@
       - defaults.yml
       paths:
       - ../vars
+      skip: true
+
+- name: Force binaries directory for CoreOS
+  set_fact:
+    bin_dir: "/opt/bin"
+  when: ansible_os_family == "CoreOS"
 
 - name: Create kubernetes config directory
   file:
@@ -85,8 +91,8 @@
     module: "{{ ansible_pkg_mgr }}"
     name: "{{ item }}"
     state: latest
-  with_items: "{{required_pkgs | union(common_required_pkgs)}}"
-  when: ansible_os_family in [ "Debian", "RedHat" ]
+  with_items: "{{required_pkgs | default([]) | union(common_required_pkgs|default([]))}}"
+  when: ansible_os_family != "CoreOS"
 
 # Todo : selinux configuration
 - name: Set selinux policy to permissive
@@ -95,6 +101,3 @@
   changed_when: False
 
 - include: etchosts.yml
-
-- include: python-bootstrap.yml
-  when: ansible_os_family not in [ "Debian", "RedHat" ]

roles/kubernetes/preinstall/tasks/python-bootstrap.yml

@@ -1,41 +0,0 @@
----
-- name: Python | Check if bootstrap is needed
-  raw: stat {{ bin_dir}}/.bootstrapped
-  register: need_bootstrap
-  ignore_errors: True
-
-- name: Python | Run bootstrap.sh
-  script: bootstrap.sh
-  when: need_bootstrap | failed
-
-- set_fact:
-    ansible_python_interpreter: "{{ bin_dir }}/python"
-
-- name: Python | Check if we need to install pip
-  shell: "{{ansible_python_interpreter}} -m pip --version"
-  register: need_pip
-  ignore_errors: True
-  changed_when: false
-  when: need_bootstrap | failed
-
-- name: Python | Copy get-pip.py
-  copy: src=get-pip.py dest=~/get-pip.py
-  when: need_pip | failed
-
-- name: Python | Install pip
-  shell: "{{ansible_python_interpreter}} ~/get-pip.py"
-  when: need_pip | failed
-
-- name: Python | Remove get-pip.py
-  file: path=~/get-pip.py state=absent
-  when: need_pip | failed
-
-- name: Python | Install pip launcher
-  copy: src=runner dest={{ bin_dir }}/pip mode=0755
-  when: need_pip | failed
-
-- name: Install required python modules
-  pip:
-    name: "{{ item }}"
-  with_items: pip_python_modules
-