diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index df7b97ab41f2bab5a2bc559e915fb8081b879d85..aa10371f5ba0f13a7aaa935f1566ff1117e24c8a 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -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' diff --git a/roles/network_plugin/weave/tasks/main.yml b/roles/network_plugin/weave/tasks/main.yml index dc0a032af99b1aacf48847c336ef659aac8cb5c9..43cb81a1c243ea54b1b9d2e0a804f952b0638859 100644 --- a/roles/network_plugin/weave/tasks/main.yml +++ b/roles/network_plugin/weave/tasks/main.yml @@ -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/"