openstack
/
tripleo-quickstart
Code Issues Proposed changes

Use the default quickstart dir for hosts and ssh.config 

Originally the usbkey used $HOME as the directory for
the hosts and ssh config. It's better and less complex
to use the quickstart default of ~/.quickstart

Change-Id: Ifb45a9faa7acc54a687633eff5e122d99fb750b2
This commit is contained in:
Wesley Hayutin 2016-06-07 10:30:19 -04:00
parent b744829b24
commit ce200d58b2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci-scripts/ooo-usbkey.sh
View File

@ -56,9 +56,9 @@ $sshcmd stack@$VIRTHOST 'pushd /tmp/usb; ./RUN_ME.sh'
export ANSIBLE_INVENTORY=$WORKSPACE/hosts
export SSH_CONFIG=$WORKSPACE/ssh.config.ansible
export ANSIBLE_SSH_ARGS="-F ${SSH_CONFIG}"
$scpcmd stack@$VIRTHOST:~/ssh.config* $WORKSPACE/
$scpcmd stack@$VIRTHOST:~/hosts* $WORKSPACE/
$scpcmd stack@$VIRTHOST:~/id_* $WORKSPACE/
$scpcmd stack@$VIRTHOST:~/.quickstart/ssh.config* $WORKSPACE/
$scpcmd stack@$VIRTHOST:~/.quickstart/hosts* $WORKSPACE/
$scpcmd stack@$VIRTHOST:~/.quickstart/id_* $WORKSPACE/
sed -i 's,\/home\/stack\/\.quickstart,'"$WORKSPACE"',g' $WORKSPACE/ssh.config.ansible
bash ci-scripts/collect-logs.sh

4
ci-scripts/usbkey/ansible_env
View File

@ -1,6 +1,6 @@
#Set ansible environmental variables
export ANSIBLE_HOST_KEY_CHECKING=False
export ANSIBLE_FORCE_COLOR=1
export ANSIBLE_INVENTORY=$HOME/hosts
export SSH_CONFIG=$HOME/ssh.config.local.ansible
export ANSIBLE_INVENTORY=$HOME/.quickstart/hosts
export SSH_CONFIG=$HOME/.quickstart/ssh.config.local.ansible
export ANSIBLE_SSH_ARGS="-F ${SSH_CONFIG}"