From 818b067071201337af8232b6cc488a971327cb20 Mon Sep 17 00:00:00 2001
From: Ali Safari <alisafar1212@gmail.com>
Date: Sun, 27 Aug 2023 15:25:13 +0330
Subject: [PATCH] Fix nova ssh keys permission

Change-Id: Ic7a2c8b5fb3ea530eba965a75122044da59713f8
---
 nova/Chart.yaml                     | 2 +-
 nova/templates/bin/_ssh-init.sh.tpl | 2 +-
 releasenotes/notes/nova.yaml        | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 56d4acd7b8..00d361c34a 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.3.17
+version: 0.3.18
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
diff --git a/nova/templates/bin/_ssh-init.sh.tpl b/nova/templates/bin/_ssh-init.sh.tpl
index 9032933d2a..8e5b187a11 100644
--- a/nova/templates/bin/_ssh-init.sh.tpl
+++ b/nova/templates/bin/_ssh-init.sh.tpl
@@ -20,7 +20,6 @@ export NOVA_USERNAME=$(id -u ${NOVA_USER_UID} -n)
 export NOVA_USER_HOME=$(eval echo ~${NOVA_USERNAME})
 
 mkdir -p ${NOVA_USER_HOME}/.ssh
-chown -R ${NOVA_USERNAME}:${NOVA_USERNAME} ${NOVA_USER_HOME}/.ssh
 
 cat > ${NOVA_USER_HOME}/.ssh/config <<EOF
 Host *
@@ -32,3 +31,4 @@ EOF
 
 cp /tmp/nova-ssh/* ${NOVA_USER_HOME}/.ssh/
 chmod 600 ${NOVA_USER_HOME}/.ssh/id_rsa
+chown -R ${NOVA_USERNAME}:${NOVA_USERNAME} ${NOVA_USER_HOME}/.ssh
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 7f26b99aa7..432de595c8 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -86,4 +86,5 @@ nova:
   - 0.3.15 Ensure that the health check script handles cases where the PID file exists but is empty or does not contain the expected data structure.
   - 0.3.16 Use service tokens
   - 0.3.17 Set targeted dependency of nova-compute with ovn networking backend
+  - 0.3.18 Fix nova ssh keys permission
 ...