diff --git a/bindep.txt b/bindep.txt
index e69de29..0265648 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -0,0 +1,9 @@
+# This is a cross-platform list tracking distribution packages needed by tests;
+# see http://docs.openstack.org/infra/bindep/ for additional information.
+
+libffi-devel [platform:rpm]
+libffi-dev [platform:dpkg]
+libselinux-python [platform:rpm]
+libssl-dev [platform:dpkg]
+openssl-devel [platform:rpm]
+python2-dnf [platform:fedora]
diff --git a/tasks/config.yaml b/tasks/config.yaml
index 2045326..4bab018 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -29,7 +29,7 @@
     mode: 0644
     owner: "{{ ssh_user_name }}"
     src: "{{ ssh_known_hosts_src }}"
-  when: ssh_known_hosts_content
+  when: ssh_known_hosts_content | default('') != ''
 
 - name: Create ssh private key.
   become: yes
@@ -39,7 +39,7 @@
     mode: 0600
     owner: "{{ ssh_user_name }}"
     src: "{{ ssh_key_private_src }}"
-  when: ssh_key_private_content
+  when: ssh_key_private_content | default('') != ''
 
 - name: Create ssh public key.
   become: yes
@@ -49,4 +49,4 @@
     mode: 0644
     owner: "{{ ssh_user_name }}"
     src: "{{ ssh_key_public_src }}"
-  when: ssh_key_public_content
+  when: ssh_key_public_content | default('') != ''