fixes yamllint for docker defaults, and weave network plugin
This commit is contained in:
parent
50e3ccfa2b
commit
f3788525ff
2 changed files with 7 additions and 7 deletions
|
@ -21,16 +21,16 @@ docker_dns_servers_strict: yes
|
|||
|
||||
docker_container_storage_setup: false
|
||||
|
||||
#CentOS/RedHat docker-ce repo
|
||||
# CentOS/RedHat docker-ce repo
|
||||
docker_rh_repo_base_url: 'https://download.docker.com/linux/centos/7/$basearch/stable'
|
||||
docker_rh_repo_gpgkey: 'https://download.docker.com/linux/centos/gpg'
|
||||
#Ubuntu docker-ce repo
|
||||
# Ubuntu docker-ce repo
|
||||
docker_ubuntu_repo_base_url: "https://download.docker.com/linux/ubuntu"
|
||||
docker_ubuntu_repo_gpgkey: 'https://download.docker.com/linux/ubuntu/gpg'
|
||||
#Debian docker-ce repo
|
||||
# Debian docker-ce repo
|
||||
docker_debian_repo_base_url: "https://download.docker.com/linux/debian"
|
||||
docker_debian_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg'
|
||||
#dockerproject repo
|
||||
# dockerproject repo
|
||||
dockerproject_rh_repo_base_url: 'https://yum.dockerproject.org/repo/main/centos/7'
|
||||
dockerproject_rh_repo_gpgkey: 'https://yum.dockerproject.org/gpg'
|
||||
dockerproject_apt_repo_base_url: 'https://apt.dockerproject.org/repo'
|
||||
|
|
|
@ -5,9 +5,9 @@
|
|||
|
||||
- name: template weavenet conflist
|
||||
template:
|
||||
src: weavenet.conflist.j2
|
||||
dest: /etc/cni/net.d/00-weave.conflist
|
||||
owner: kube
|
||||
src: weavenet.conflist.j2
|
||||
dest: /etc/cni/net.d/00-weave.conflist
|
||||
owner: kube
|
||||
|
||||
- name: Weave | Copy cni plugins from hyperkube
|
||||
command: "{{ docker_bin_dir }}/docker run --rm -v /opt/cni/bin:/cnibindir {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }} /bin/cp -r /opt/cni/bin/. /cnibindir/"
|
||||
|
|
Loading…
Reference in a new issue