cri-o
diff --git a/‎README.md‎
Lines changed: 10 additions & 4 deletions b/‎README.md‎
Lines changed: 10 additions & 4 deletions
diff --git a/‎centos.yml‎ ‎cri-o.yml‎centos.yml renamed to cri-o.yml
Lines changed: 80 additions & 4 deletions b/‎centos.yml‎ ‎cri-o.yml‎centos.yml renamed to cri-o.yml
Lines changed: 80 additions & 4 deletions
diff --git a/‎hosts.template‎
Lines changed: 0 additions & 1 deletion b/‎hosts.template‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎run.sh‎
Lines changed: 0 additions & 29 deletions b/‎run.sh‎
Lines changed: 0 additions & 29 deletions
diff --git a/‎ubuntu.yml‎
Lines changed: 0 additions & 125 deletions b/‎ubuntu.yml‎
Lines changed: 0 additions & 125 deletions
@@ -1,10 +1,16 @@
-This playbook provisions a CentOS 7.3/Ubuntu 16.04 machine with everything you need in order to
+This playbook provisions a CentOS 7.3/Ubuntu 16.04/RHEL/Fedora 25+ machine with everything you need in order to
 use `kubeadm` and `CRI-O` (no `docker` no more). Simply run:
 
+Create an ansible `hosts` file (adjust anything needed like `ansible_python_interpreter`):
 ```sh
-./run.sh centos <IP or hostname>
-# if you're on Ubuntu
-./run.sh ubuntu <IP or hostname>
+$ cat hosts
+192.168.1.122 ansible_python_interpreter='python3'
+```
+
+Then simply run:
+
+```sh
+$ ansible-playbook -i hosts cri-o.yml
 ```
 
 **make sure the machine is reachable via SSH w/o password input**
 
@@ -2,7 +2,32 @@
 - hosts: all
   remote_user: root
   tasks:
-    - name: Make sure we have all required packages
+    - name: Make sure we have all required packages on Fedora
+      dnf:
+        name: "{{ item }}"
+        state: latest
+      with_items:
+        - wget
+        - git
+        - make
+        - gcc
+        - tar
+        - libseccomp-devel
+        - golang
+        - glib2-devel
+        - glibc-static
+        - container-selinux
+        - btrfs-progs-devel
+        - device-mapper-devel
+        - glibc-devel
+        - gpgme-devel
+        - libassuan-devel
+        - libgpg-error-devel
+        - pkgconfig
+        - skopeo-containers
+      when: ansible_distribution == 'Fedora'
+    - name: Make sure we have all required packages on RHEL/CentOS
+      when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')
       yum:
         name: "{{ item }}"
         state: latest
@@ -27,6 +52,33 @@
         - json-glib-devel
         - skopeo-containers
         - docker
+    - name: Make sure we have all required packages on Ubuntu
+      package:
+        name: "{{ item }}"
+        state: latest
+      with_items:
+        - apt-transport-https
+        - build-essential
+        - curl
+        - gawk
+        - iptables
+        - pkg-config
+        - libaio-dev
+        - libcap-dev
+        - libprotobuf-dev
+        - libseccomp2
+        - libseccomp-dev
+        - protobuf-compiler
+        - python-minimal
+        - libglib2.0-dev
+        - libjson-glib-dev
+        - libapparmor-dev
+        - btrfs-tools
+        - libdevmapper1.02.1
+        - libdevmapper-dev
+        - libgpgme11-dev
+        - aptitude
+      when: ansible_distribution == 'Ubuntu'
     - name: Make directories
       file:
         path: "{{ item }}"
@@ -36,19 +88,36 @@
            - /etc/systemd/system/kubelet.service.d/
            - /var/lib/etcd
            - /etc/cni/net.d
-    - name: install Golang upstream in CentOS
+           - /etc/containers
+    - name: install Golang upstream
       shell: |
               curl -fsSL "https://golang.org/dl/go1.8.3.linux-amd64.tar.gz" \
               | tar -xzC /usr/local
-    - name: Set custom Golang path for CentOS
+    - name: Set custom Golang path in RHEL/CentOS/Fedora
       lineinfile:
         dest: /root/.bashrc
         line: 'export PATH=/usr/local/go/bin:$PATH'
         insertafter: 'EOF'
         regexp: 'export PATH=\/usr\/local\/go\/bin:\$PATH'
         state: present
-    - name: update all
+      when: (ansible_distribution == 'Fedora' or ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')
+    - name: link golang in Ubuntu
+      file: src=/usr/local/go/bin/go dest=/usr/bin/go state=link
+      when: ansible_distribution == 'Ubuntu'
+    - name: Update all in Ubuntu
+      apt:
+        upgrade: yes
+        update_cache: yes
+        cache_valid_time: 86400 #One day
+      when: ansible_distribution == 'Ubuntu'
+    - name: update all in RHEL/CentOS
       yum: name=* state=latest
+      when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
+    - name: Update all packages on Fedora
+      dnf:
+        name: '*'
+        state: latest
+      when: ansible_distribution == 'Fedora'
     - name: clone runc
       git:
         repo: https://github.com/opencontainers/runc
@@ -83,6 +152,10 @@
               make install.systemd && \
               make install.config
       when: clone_crio.changed
+    - name: install policy.json in Ubuntu
+      shell: |
+              cd /root/src/github.com/kubernetes-incubator/cri-o && \
+              cp test/policy.json /etc/containers/policy.json
     - name: build CNI stuff
       shell: |
               cd /root/src/github.com/containernetworking/plugins && \
@@ -96,6 +169,7 @@
         replace: 'systemd'
         name: /etc/crio/crio.conf
         backup: yes
+      when: (ansible_distribution == 'Fedora' or ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')
     - name: run with overlay2
       replace:
         regexp: 'storage_driver = ""'
@@ -109,6 +183,7 @@
         insertafter: 'storage_option = \['
         regexp: 'overlay2\.override_kernel_check=1'
         state: present
+      when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')
     - name: enable and start CRI-O
       systemd:
         name: crio
@@ -140,3 +215,4 @@
         dest: /etc/selinux/config
         line: 'SELINUX=permissive'
         regexp: '^SELINUX='
+      when: (ansible_distribution == 'Fedora' or ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')