integration: Use vars_files in plays

It's unsightly and hard to maintain collections of references and long
lists across multiple playbooks/include files.  Centralize them all
in ``vars.yml``, then include that in all plays.

Minor: Update all files with a newline at the start and end.

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2017-09-26 07:27:18 -04:00
parent a30a118fe6
commit 493a72bbc9
13 changed files with 101 additions and 86 deletions

View file

@ -1,4 +1,5 @@
---
- name: clone bats source repo
git:
repo: "https://github.com/sstephenson/bats.git"
@ -14,4 +15,4 @@
file:
src: /usr/local/bin/bats
dest: /usr/bin/bats
state: link
state: link

View file

@ -1,4 +1,5 @@
---
- name: stat the expected cri-o directory
stat:
path: "{{ ansible_env.GOPATH }}/src/github.com/kubernetes-incubator/cri-o"
@ -75,4 +76,4 @@
insertafter: 'storage_option = \['
regexp: 'overlay2\.override_kernel_check=1'
state: present
when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'

View file

@ -1,4 +1,5 @@
---
- name: clone cri-tools source repo
git:
repo: "https://github.com/kubernetes-incubator/cri-tools.git"
@ -12,4 +13,4 @@
file:
src: "{{ ansible_env.GOPATH }}/bin/crictl"
dest: /usr/bin/crictl
state: link
state: link

View file

@ -1,4 +1,5 @@
---
- name: clone kubernetes source repo
git:
repo: "https://github.com/runcom/kubernetes.git"
@ -58,4 +59,4 @@
dest: /etc/environment
line: 'KUBECONFIG=/var/run/kubernetes/admin.kubeconfig'
regexp: 'KUBECONFIG='
state: present
state: present

View file

@ -1,4 +1,5 @@
---
- name: clone plugins source repo
git:
repo: "https://github.com/containernetworking/plugins.git"
@ -46,4 +47,4 @@
src: "{{ ansible_env.GOPATH }}/src/github.com/containernetworking/plugins/bin/bridge"
dest: "/opt/cni/bin/bridge-custom"
mode: "o=rwx,g=rx,o=rx"
remote_src: yes
remote_src: yes

View file

@ -1,4 +1,5 @@
---
- name: clone runc source repo
git:
repo: "https://github.com/opencontainers/runc.git"
@ -18,4 +19,4 @@
file:
src: /usr/local/sbin/runc
dest: /usr/bin/runc
state: link
state: link