Commit 1e7cf3e0 authored by David Johnson's avatar David Johnson

Disable the testbed's root ssh key service until we can remove ours.

It seems to race (rarely) with our startup scripts; but that is enough
to screw up the setup scripts.
parent ca1048e6
......@@ -3,6 +3,8 @@
import geni.portal as portal
import geni.rspec.pg as RSpec
import geni.rspec.igext as IG
# Emulab specific extensions.
import geni.rspec.emulab as emulab
from lxml import etree as ET
import crypt
import random
......@@ -12,6 +14,12 @@ import sys
TBURL = "http://www.emulab.net/downloads/openstack-setup-v33.tar.gz"
TBCMD = "sudo mkdir -p /root/setup && (if [ -d /local/repository ]; then sudo -H /local/repository/setup-driver.sh 2>&1 | sudo tee /root/setup/setup-driver.log; else sudo -H /tmp/setup/setup-driver.sh 2>&1 | sudo tee /root/setup/setup-driver.log; fi)"
#
# For now, disable the testbed's root ssh key service until we can remove ours.
# It seems to race (rarely) with our startup scripts.
#
disableTestbedRootKeys = True
#
# Create our in-memory model of the RSpec -- the resources we're going to request
# in our experiment, and their configuration.
......@@ -580,6 +588,8 @@ if mgmtlan:
if TBURL is not None:
controller.addService(RSpec.Install(url=TBURL, path="/tmp"))
controller.addService(RSpec.Execute(shell="sh",command=TBCMD))
if disableTestbedRootKeys:
controller.installRootKeys(False, False)
if params.controllerHost != params.networkManagerHost:
#
......@@ -615,6 +625,8 @@ if params.controllerHost != params.networkManagerHost:
if TBURL is not None:
networkManager.addService(RSpec.Install(url=TBURL, path="/tmp"))
networkManager.addService(RSpec.Execute(shell="sh",command=TBCMD))
if disableTestbedRootKeys:
networkManager.installRootKeys(False, False)
pass
#
......@@ -668,6 +680,8 @@ for (siteNumber,cpnameList) in computeNodeNamesBySite.iteritems():
if TBURL is not None:
cpnode.addService(RSpec.Install(url=TBURL, path="/tmp"))
cpnode.addService(RSpec.Execute(shell="sh",command=TBCMD))
if disableTestbedRootKeys:
cpnode.installRootKeys(False, False)
computeNodeList += cpname + ' '
pass
pass
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment