Browse Source

Merge "Move SSH pubkey to static path"

Zuul 1 month ago
parent
commit
de4f53847d
3 changed files with 3 additions and 2 deletions
  1. 1
    0
      openstack_deploy/ssh
  2. 1
    1
      openstack_deploy/user_variables.yml
  3. 1
    1
      scripts/run_deploy.sh

+ 1
- 0
openstack_deploy/ssh View File

@@ -0,0 +1 @@
1
+../ssh

+ 1
- 1
openstack_deploy/user_variables.yml View File

@@ -9,7 +9,7 @@ haproxy_keepalived_external_interface: eth1
9 9
 haproxy_keepalived_internal_interface: eth1
10 10
 
11 11
 # Add the SSH pubkey needed for deployment
12
-lxc_container_ssh_key: "{{ lookup('file', inventory_dir ~ '/../../ssh/id_rsa.pub') }}"
12
+lxc_container_ssh_key: "{{ lookup('file', '/etc/openstack_deploy/ssh/id_rsa.pub') }}"
13 13
 
14 14
 # Configure SSH keys on hosts
15 15
 ssh_key_url: https://git.openstack.org/cgit/openstack/limestone-ci-cloud/plain/ssh/authorized_keys

+ 1
- 1
scripts/run_deploy.sh View File

@@ -6,7 +6,7 @@ export SCRIPT_PATH=$(dirname $(readlink -f "$0"))
6 6
 export PROJECT_PATH=$(dirname "$SCRIPT_PATH")
7 7
 export SETUP_ARA="${SETUP_ARA:-false}"
8 8
 
9
-cp -R ${PROJECT_PATH}/openstack_deploy /etc
9
+cp -RL ${PROJECT_PATH}/openstack_deploy /etc
10 10
 pushd ${PROJECT_PATH}/openstack-ansible
11 11
 source scripts/bootstrap-ansible.sh
12 12
 if [ "$SETUP_ARA" == true ]; then

Loading…
Cancel
Save