Merge pull request #73 from leifmadsen/master

Clean up some missing values
redhat-nfvpe · Oct 20, 2017 · 3d198b2 · 3d198b2
2 parents f0c8fe1 + 41e4e09
commit 3d198b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/kube-install.yml b/kube-install.yml
@@ -53,4 +53,4 @@
   become_user: root
   tasks: []
   roles:
-    - { role: kubectl-proxy-systemd }
+    - { role: kubectl-proxy-systemd }
diff --git a/roles/vm-spinup/templates/vms.local.j2 b/roles/vm-spinup/templates/vms.local.j2
@@ -19,7 +19,7 @@ kube-node-3
 [all_vms:vars]
 ansible_user=centos
 {% if ssh_proxy_enabled %}
-ansible_ssh_common_args='-o ProxyCommand="ssh {% if ssh_proxy_port %}-p {{ ssh_proxy_port }}{% endif %} -W %h:%p {{ ssh_proxy_user }}@{{ ssh_proxy_host }}"'
+ansible_ssh_common_args='-o ProxyCommand="ssh{% if ssh_proxy_port is defined %}-p {{ ssh_proxy_port }}{% endif %} -W %h:%p {{ ssh_proxy_user }}@{{ ssh_proxy_host }}"'
 {% endif %}
 {% if vm_ssh_key_path is defined %}
 ansible_ssh_private_key_file={{ vm_ssh_key_path }}