From 1d1636db02817d68e1ae2eff7d40d7d0240f5ed1 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Sat, 21 Jan 2017 17:56:51 -0500 Subject: [PATCH] Work around 2.2.1.0 regression There appears to be an issue with upstream ansible, see: https://github.com/ansible/ansible/issues/20392 The following is just a workaround, until upstream fixes our issue. Add bindep.txt to address gate issue around compiling ansible. Change-Id: Icc09164743da0d537c369040510998869486f3b3 Signed-off-by: Paul Belanger --- bindep.txt | 9 +++++++++ tasks/config.yaml | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) 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('') != ''