From c56709b6c1ce24137898c9d69bf07c387f8d0f82 Mon Sep 17 00:00:00 2001
From: Ilya Shakhat <shakhat@gmail.com>
Date: Fri, 11 Jan 2019 14:59:58 +0100
Subject: [PATCH] Fix key management in devstack job

Change-Id: I4fa999b58d0bebb44fac17b30d93056da7bdb589
---
 devstack/lib/os-faults                            | 2 ++
 os_faults/tests/devstack/os-faults-devstack.yaml  | 2 +-
 os_faults/tests/devstack/os-faults-universal.yaml | 2 +-
 os_faults/tests/devstack/test_lib.py              | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/devstack/lib/os-faults b/devstack/lib/os-faults
index b224a49..ef81d41 100644
--- a/devstack/lib/os-faults
+++ b/devstack/lib/os-faults
@@ -10,7 +10,9 @@ function install_os_faults() {
 }
 
 function configure_os_faults() {
+    # if no key existed, create it; otherwise overwrite
     mkdir -p ${SSH_DIR}
+    rm -f ${SSH_DIR}/os-faults-key*
     ssh-keygen -t rsa -f ${SSH_DIR}/os-faults-key -N ''
     cat ${SSH_DIR}/os-faults-key.pub >> ${SSH_DIR}/authorized_keys
     cp ${SSH_DIR}/os-faults-key* ${PROJECT_DIR}
diff --git a/os_faults/tests/devstack/os-faults-devstack.yaml b/os_faults/tests/devstack/os-faults-devstack.yaml
index 51ff5ae..0f4504b 100644
--- a/os_faults/tests/devstack/os-faults-devstack.yaml
+++ b/os_faults/tests/devstack/os-faults-devstack.yaml
@@ -4,5 +4,5 @@ cloud_management:
     address: localhost
     auth:
       username: stack
-      private_key_file: os_faults_key
+      private_key_file: /opt/stack/.ssh/os-faults-key
     iface: lo
diff --git a/os_faults/tests/devstack/os-faults-universal.yaml b/os_faults/tests/devstack/os-faults-universal.yaml
index a17876d..370406b 100644
--- a/os_faults/tests/devstack/os-faults-universal.yaml
+++ b/os_faults/tests/devstack/os-faults-universal.yaml
@@ -6,7 +6,7 @@ node_discover:
     - ip: localhost
       auth:
         username: stack
-        private_key_file: os_faults_key
+        private_key_file: /opt/stack/.ssh/os-faults-key
 services:
   memcached:
     args:
diff --git a/os_faults/tests/devstack/test_lib.py b/os_faults/tests/devstack/test_lib.py
index 4df189c..d82f069 100644
--- a/os_faults/tests/devstack/test_lib.py
+++ b/os_faults/tests/devstack/test_lib.py
@@ -32,7 +32,7 @@ class TestOSFaultsUniversalDriverLibrary(base.BaseTestCase):
                         'ip': 'localhost',
                         'auth': {
                             'username': 'stack',
-                            'private_key_file': 'os_faults_key'
+                            'private_key_file': '/opt/stack/.ssh/os-faults-key'
                         }
                     }
                 ]
@@ -59,7 +59,7 @@ class TestOSFaultsDevstackDriverLibrary(base.BaseTestCase):
                         'iface': 'lo',
                         'auth': {
                             'username': 'stack',
-                            'private_key_file': 'os_faults_key'
+                            'private_key_file': '/opt/stack/.ssh/os-faults-key'
                         }
                     }
             }