Merge "Move SSH pubkey to static path"
This commit is contained in:
commit
de4f53847d
|
@ -0,0 +1 @@
|
||||||
|
../ssh
|
|
@ -9,7 +9,7 @@ haproxy_keepalived_external_interface: eth1
|
||||||
haproxy_keepalived_internal_interface: eth1
|
haproxy_keepalived_internal_interface: eth1
|
||||||
|
|
||||||
# Add the SSH pubkey needed for deployment
|
# 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
|
# Configure SSH keys on hosts
|
||||||
ssh_key_url: https://git.openstack.org/cgit/openstack/limestone-ci-cloud/plain/ssh/authorized_keys
|
ssh_key_url: https://git.openstack.org/cgit/openstack/limestone-ci-cloud/plain/ssh/authorized_keys
|
||||||
|
|
|
@ -6,7 +6,7 @@ export SCRIPT_PATH=$(dirname $(readlink -f "$0"))
|
||||||
export PROJECT_PATH=$(dirname "$SCRIPT_PATH")
|
export PROJECT_PATH=$(dirname "$SCRIPT_PATH")
|
||||||
export SETUP_ARA="${SETUP_ARA:-false}"
|
export SETUP_ARA="${SETUP_ARA:-false}"
|
||||||
|
|
||||||
cp -R ${PROJECT_PATH}/openstack_deploy /etc
|
cp -RL ${PROJECT_PATH}/openstack_deploy /etc
|
||||||
pushd ${PROJECT_PATH}/openstack-ansible
|
pushd ${PROJECT_PATH}/openstack-ansible
|
||||||
source scripts/bootstrap-ansible.sh
|
source scripts/bootstrap-ansible.sh
|
||||||
if [ "$SETUP_ARA" == true ]; then
|
if [ "$SETUP_ARA" == true ]; then
|
||||||
|
|
Loading…
Reference in New Issue