From 912b094835c5d561936f6424a3d21c15ac4ac016 Mon Sep 17 00:00:00 2001
From: Logan V <logan2211@gmail.com>
Date: Sun, 17 Mar 2019 13:48:20 -0500
Subject: [PATCH] Move SSH pubkey to static path

Change-Id: Ib271711428c055ce5e8e30051ea8b0468ac9c74d
---
 openstack_deploy/ssh                | 1 +
 openstack_deploy/user_variables.yml | 2 +-
 scripts/run_deploy.sh               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 120000 openstack_deploy/ssh

diff --git a/openstack_deploy/ssh b/openstack_deploy/ssh
new file mode 120000
index 0000000..af60fad
--- /dev/null
+++ b/openstack_deploy/ssh
@@ -0,0 +1 @@
+../ssh
\ No newline at end of file
diff --git a/openstack_deploy/user_variables.yml b/openstack_deploy/user_variables.yml
index 53a14e7..f9ae685 100644
--- a/openstack_deploy/user_variables.yml
+++ b/openstack_deploy/user_variables.yml
@@ -9,7 +9,7 @@ haproxy_keepalived_external_interface: eth1
 haproxy_keepalived_internal_interface: eth1
 
 # Add the SSH pubkey needed for deployment
-lxc_container_ssh_key: "{{ lookup('file', inventory_dir ~ '/../../ssh/id_rsa.pub') }}"
+lxc_container_ssh_key: "{{ lookup('file', '/etc/openstack_deploy/ssh/id_rsa.pub') }}"
 
 # Configure SSH keys on hosts
 ssh_key_url: https://git.openstack.org/cgit/openstack/limestone-ci-cloud/plain/ssh/authorized_keys
diff --git a/scripts/run_deploy.sh b/scripts/run_deploy.sh
index 71e6ee2..c739163 100755
--- a/scripts/run_deploy.sh
+++ b/scripts/run_deploy.sh
@@ -6,7 +6,7 @@ export SCRIPT_PATH=$(dirname $(readlink -f "$0"))
 export PROJECT_PATH=$(dirname "$SCRIPT_PATH")
 export INSTALL_ARA="${INSTALL_ARA:-false}"
 
-cp -R ${PROJECT_PATH}/openstack_deploy /etc
+cp -RL ${PROJECT_PATH}/openstack_deploy /etc
 pushd ${PROJECT_PATH}/openstack-ansible
 source scripts/bootstrap-ansible.sh
 if [ "$INSTALL_ARA" == true ]; then