openstack: cloudlab support (part 5)

There is no need for host-record=ctl etc. the profile has been modified
and OS_AUTH_URL is a fqdn.

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/teuthology/openstack/setup-openstack.sh b/teuthology/openstack/setup-openstack.sh
index b467c361a8f0a3270b7dca234f24e3ca770dffe2..f26d27da44ceaa7a6fa4e0932b9884e37d35ce9e 100755 (executable)
--- a/teuthology/openstack/setup-openstack.sh
+++ b/teuthology/openstack/setup-openstack.sh
@@ -412,9 +412,6 @@ function define_dnsmasq() {
         done | sudo tee $host_records > /tmp/dnsmasq
         head -2 /tmp/dnsmasq
         echo 'etc.'
-        if test "$OS_CLOUDLAB_CTL_IP" ; then
-            echo "host-record=ctl,$OS_CLOUDLAB_CTL_IP" | sudo tee -a $host_records
-        fi
         # restart is not always picking up changes
         sudo /etc/init.d/dnsmasq stop || true
         sudo /etc/init.d/dnsmasq start
@@ -479,9 +476,6 @@ function install_packages() {
 CAT=${CAT:-cat}
 
 function verify_openstack() {
-    if test "$OS_CLOUDLAB_CTL_IP" ; then
-        echo $OS_CLOUDLAB_CTL_IP ctl | sudo tee -a /etc/hosts >&2
-    fi
     if ! openstack server list > /dev/null ; then
         echo ERROR: the credentials from ~/openrc.sh are not working >&2
         return 1