From f3788525ffcae3229bbd22881271f44fb7cba1aa Mon Sep 17 00:00:00 2001
From: Dann Bohn <djb44@psu.edu>
Date: Tue, 13 Mar 2018 06:15:48 -0400
Subject: [PATCH] fixes yamllint for docker defaults, and weave network plugin
---
roles/docker/defaults/main.yml | 8 ++++----
roles/network_plugin/weave/tasks/main.yml | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index df7b97ab4..aa10371f5 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 dc0a032af..43cb81a1c 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/"
--
GitLab