From 361b11f3e3f1cefc4c19ddecc521a847d2a9f78d Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Thu, 19 Oct 2017 11:52:15 -0700
Subject: [PATCH] Add-sshkey: remove pubkey if present

A mismatched private/public pair causes openssh to fail.  Go figure.

Change-Id: Ic5a51cc5a0b0d04bb2bb617c08f7d5425c9cf36f
---
 roles/add-sshkey/tasks/main.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/roles/add-sshkey/tasks/main.yaml b/roles/add-sshkey/tasks/main.yaml
index 171187524..b83cd4ea8 100644
--- a/roles/add-sshkey/tasks/main.yaml
+++ b/roles/add-sshkey/tasks/main.yaml
@@ -4,6 +4,14 @@
     content: "{{ ssh_key.ssh_private_key }}"
     mode: 0400
 
+# To almost everyone's surprise, if your pub key is different than
+# your private, the private won't work.  But it's okay for it to be
+# absent.
+- name: Delete ssh pub key if it exists
+  file:
+    path: "~/.ssh/id_rsa.pub"
+    state: absent
+
 - name: Add host key information to known hosts
   known_hosts:
     name: "{{ ssh_key.fqdn }}"