Merge "Print undercloud IP after deployment"

diff --combined ci/deploy.sh
index 7ae6087,7de3c7f..5fcc388
--- 1/ci/deploy.sh
--- 2/ci/deploy.sh
+++ b/ci/deploy.sh
@@@ -40,7 -40,7 +40,7 @@@ DEPLOY_OPTIONS="
  CONFIG=${CONFIG:-'/var/opt/opnfv'}
  RESOURCES=${RESOURCES:-"$CONFIG/images"}
  LIB=${LIB:-"$CONFIG/lib"}
 -OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network"
 +OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network api_network"
  
  VM_CPUS=4
  VM_RAM=8
@@@ -51,7 -51,6 +51,7 @@@ NET_MAP['admin_network']="br-admin
  NET_MAP['private_network']="br-private"
  NET_MAP['public_network']="br-public"
  NET_MAP['storage_network']="br-storage"
 +NET_MAP['api_network']="br-api"
  ext_net_type="interface"
  ip_address_family=4
  
@@@ -1005,9 -1004,9 +1005,9 @@@ EO
        ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
  source overcloudrc
  echo "Keystone Endpoint List:"
 -keystone endpoint-list
 +openstack endpoint list
  echo "Keystone Service List"
 -keystone service-list
 +openstack service list
  cinder quota-show \$(openstack project list | grep admin | awk {'print \$2'})
  EOI
    fi
@@@ -1025,14 -1024,14 +1025,14 @@@ function configure_post_install 
  source overcloudrc
  set -o errexit
  echo "Configuring Neutron external network"
 -neutron net-create external --router:external=True --tenant-id \$(keystone tenant-get service | grep id | awk '{ print \$4 }')
 -neutron subnet-create --name external-net --tenant-id \$(keystone tenant-get service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr}
 +neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }')
 +neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr}
  
  echo "Removing swift endpoint and service"
 -swift_service_id=\$(keystone service-list | grep swift | cut -d ' ' -f 2)
 -swift_endpoint_id=\$(keystone endpoint-list | grep \$swift_service_id | cut -d ' ' -f 2)
 -keystone endpoint-delete \$swift_endpoint_id
 -keystone service-delete \$swift_service_id
 +swift_service_id=\$(openstack service list | grep swift | cut -d ' ' -f 2)
 +swift_endpoint_id=\$(openstack endpoint list | grep swift | cut -d ' ' -f 2)
 +openstack endpoint delete \$swift_endpoint_id
 +openstack service delete \$swift_service_id
  EOI
  
    echo -e "${blue}INFO: Checking if OVS bridges have IP addresses...${reset}"
@@@ -1111,8 -1110,9 +1111,9 @@@ f
  EOF
  done
  
- # Print out the dashboard URL
+ # Print out the undercloud IP and dashboard URL
  source stackrc
+ echo "Undercloud IP: $UNDERCLOUD, please connect by doing 'opnfv-util undercloud'"
  echo "Overcloud dashboard available at http://\$(heat output-show overcloud PublicVip | sed 's/"//g')/dashboard"
  EOI