Efforts to address SSH connection issues

JIRA: MODELS-23

Change-Id: I1a230815e232c4cb5b50463d2be06cfb0227ea36
Signed-off-by: blsaws <bryan.sullivan@att.com>

2 files changed, 11 insertions, 4 deletions

diff --git a/tests/utils/ansible-setup.sh b/tests/utils/ansible-setup.sh
index 6438da6..67e4d59 100644
--- a/tests/utils/ansible-setup.sh
+++ b/tests/utils/ansible-setup.sh
@@ -141,7 +141,7 @@ function setup () {
   pip install --upgrade shade
 
   echo "$0: Create key pair for interacting with servers via Ansible"
-  ssh-keygen -t rsa -N "" -f /tmp/ansible/ansible
+  ssh-keygen -t rsa -N "" -f /tmp/ansible/ansible -C ubuntu@ansible
   chmod 600 /tmp/ansible/ansible
 }
 
diff --git a/tests/vLamp_Ansible.sh b/tests/vLamp_Ansible.sh
index 1a1ca59..38efaa5 100644
--- a/tests/vLamp_Ansible.sh
+++ b/tests/vLamp_Ansible.sh
@@ -119,7 +119,7 @@ app_env: {
   image_name: "xenial-server",
   region_name: "RegionOne",
   private_net_name: "internal",
-  public_net_name: "$FLOATING_NETWORK_ID",
+  public_net_name: "$FLOATING_NETWORK_NAME",
   flavor_name: "m1.small",
   public_key_file: "/tmp/ansible/ansible.pub",
   stack_size: 4,
@@ -130,6 +130,9 @@ app_env: {
 }
 EOF
 
+  echo "$0: Setup ubuntu as ansible_user (fix for SSH connection issues?)"
+  echo "ansible_user: ubuntu" >>/tmp/ansible/blueprints/lampstack/group_vars/all.yml
+
   echo "$0: Setup ubuntu-xenial glance image if needed"
   if [[ -z $(openstack image list | awk "/ xenial-server / { print \$2 }") ]]; then glance --os-image-api-version 1 image-create --name xenial-server --disk-format qcow2 --location https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img --container-format bare; fi 
 
@@ -155,15 +158,19 @@ EOF
 
 start() {
   echo "$0: Add ssh key"
+  chown root /tmp/ansible/ansible.pem
   eval $(ssh-agent -s)
   ssh-add /tmp/ansible/ansible.pem
 
   echo "$0: setup OpenStack environment"
   source /tmp/ansible/admin-openrc.sh
 
+  echo "$0: Clear known hosts (workaround for ssh connection issues)"
+  rm ~/.ssh/known_hosts
+
   echo "$0: invoke blueprint install via Ansible"
   cd /tmp/ansible/blueprints/lampstack
-  ansible-playbook -e "action=apply env=opnfv password=$OS_PASSWORD" site.yml
+  ansible-playbook -vvv -e "action=apply env=opnfv password=$OS_PASSWORD" -u ubuntu site.yml
 
   pass
 }
@@ -178,7 +185,7 @@ stop() {
 
   echo "$0: invoke blueprint destroy via Ansible"
   cd /tmp/ansible/blueprints/lampstack
-  ansible-playbook -e "action=destroy env=opnfv password=$OS_PASSWORD" site.yml
+  ansible-playbook -vvv -e "action=destroy env=opnfv password=$OS_PASSWORD" -u ubuntu site.yml
 
   pass
 }