summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-21 20:09:33 -0400
committerGitHub <noreply@github.com>2017-08-21 20:09:33 -0400
commitb107f677a3563f6db9a1ef17fe10518d321d495c (patch)
treed111c38215f6ebea88d3487a4f6bf1686039671d
parent00afac6ef3235ab66e0a0c02cc863cb577e127f2 (diff)
parentddfe82bd796b9b77a50b4b1ed55b941d8f621b23 (diff)
downloadopenshift-b107f677a3563f6db9a1ef17fe10518d321d495c.tar.gz
openshift-b107f677a3563f6db9a1ef17fe10518d321d495c.tar.bz2
openshift-b107f677a3563f6db9a1ef17fe10518d321d495c.tar.xz
openshift-b107f677a3563f6db9a1ef17fe10518d321d495c.zip
Merge pull request #5126 from ozdanborne/fix-calico-spacing
Fix missing space in calico ansible roles
-rw-r--r--roles/calico/defaults/main.yaml2
-rw-r--r--roles/calico/tasks/main.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/calico/defaults/main.yaml b/roles/calico/defaults/main.yaml
index 03c96be36..b1907f8cb 100644
--- a/roles/calico/defaults/main.yaml
+++ b/roles/calico/defaults/main.yaml
@@ -1,5 +1,5 @@
---
-kubeconfig: "{{openshift.common.config_base}}/node/{{ 'system:node:' + openshift.common.hostname }}.kubeconfig"
+kubeconfig: "{{ openshift.common.config_base }}/node/{{ 'system:node:' + openshift.common.hostname }}.kubeconfig"
cni_conf_dir: "/etc/cni/net.d/"
cni_bin_dir: "/opt/cni/bin/"
diff --git a/roles/calico/tasks/main.yml b/roles/calico/tasks/main.yml
index e62378532..39f730462 100644
--- a/roles/calico/tasks/main.yml
+++ b/roles/calico/tasks/main.yml
@@ -38,7 +38,7 @@
path: "{{ item }}"
with_items:
- "{{ calico_etcd_ca_cert_file }}"
- - "{{ calico_etcd_cert_file}}"
+ - "{{ calico_etcd_cert_file }}"
- "{{ calico_etcd_key_file }}"
- name: Calico Node | Configure Calico service unit file