Merge pull request #5 from GheRivero/master

runcom · web-flow · commit 95311d2a1dbc · 2017-06-14T18:36:03.000+02:00
Some cleanups for ubuntu hosts
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+hosts
diff --git a/README.md b/README.md
@@ -11,13 +11,13 @@ $ cat hosts
 **make sure the machine is reachable via SSH w/o password input before running the playbook**
 
 ```
-ssh-copy-id root@<ip or hostname>
+ssh-copy-id <user>@<ip or hostname>
 ```
 
 Then simply run:
 
 ```sh
-$ ansible-playbook -i hosts cri-o.yml
+$ ansible-playbook -i hosts cri-o.yml -u <user>
 ```
 
 You can then follow the `kubeadm` [docs](https://kubernetes.io/docs/getting-started-guides/kubeadm/) to install Kubernetes. I've tested the whole flow with a [custom Flannel pod network](https://gist.githubusercontent.com/sameo/cf92f65ae54a87807ed294f3de658bcf/raw/95d9a66a2268b779dbb25988541136d1ed2fbfe2/flannel.yaml), the official one seems broken.
diff --git a/cri-o.yml b/cri-o.yml
@@ -1,6 +1,6 @@
 ---
 - hosts: all
-  remote_user: root
+  become: true
   tasks:
     - name: Make sure we have all required packages on Fedora
       dnf:
@@ -54,8 +54,11 @@
         - pkgconfig
         - json-glib-devel
         - skopeo-containers
-    - name: update on ubuntu
-      command: "apt-get update"
+    - name: Update all in Ubuntu
+      apt:
+        upgrade: dist
+        update_cache: yes
+        cache_valid_time: 86400 #One day
       when: ansible_distribution == 'Ubuntu'
     - name: Make sure we have all required packages on Ubuntu
       package:
@@ -95,9 +98,10 @@
            - /etc/cni/net.d
            - /etc/containers
     - name: install Golang upstream
-      shell: |
-              curl -fsSL "https://golang.org/dl/go1.8.3.linux-amd64.tar.gz" \
-              | tar -xzC /usr/local
+      unarchive:
+        src: "https://golang.org/dl/go1.8.3.linux-amd64.tar.gz"
+        dest: "/usr/local"
+        remote_src: True
     - name: Set custom Golang path in RHEL/CentOS/Fedora
       lineinfile:
         dest: /root/.bashrc
@@ -108,12 +112,6 @@
       when: (ansible_distribution == 'Fedora' or ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')
     - name: link golang
       file: src=/usr/local/go/bin/go dest=/usr/bin/go state=link
-    - 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'
