commit | 0c5da860803465489dc85c4d5eebc38deef2d668 | [log] [tgz] |
---|---|---|
author | Andy Bavier <acb@cs.princeton.edu> | Thu Jan 07 16:33:02 2016 -0500 |
committer | Andy Bavier <acb@cs.princeton.edu> | Thu Jan 07 16:33:02 2016 -0500 |
tree | 8e7d3ee11bfa02310cc9a6f43c167ff92fed1d80 | |
parent | c22f24ff37056993ed7335d0f7fd58729aadb9a5 [diff] |
Moved admin credentials
diff --git a/xos/configurations/cord/dataplane/gen-etc-hosts.sh b/xos/configurations/cord/dataplane/gen-etc-hosts.sh index ce98731..6c07ef9 100755 --- a/xos/configurations/cord/dataplane/gen-etc-hosts.sh +++ b/xos/configurations/cord/dataplane/gen-etc-hosts.sh
@@ -1,7 +1,7 @@ #!/bin/bash # set -x -source ../../common/admin-openrc.sh +source ../../setup/admin-openrc.sh get_ip () { LABEL=$1
diff --git a/xos/configurations/cord/dataplane/gen-inventory.sh b/xos/configurations/cord/dataplane/gen-inventory.sh index 590376d..74a5ac8 100755 --- a/xos/configurations/cord/dataplane/gen-inventory.sh +++ b/xos/configurations/cord/dataplane/gen-inventory.sh
@@ -1,7 +1,7 @@ #!/bin/bash # set -x -source ../../common/admin-openrc.sh +source ../../setup/admin-openrc.sh get_ip () { LABEL=$1
diff --git a/xos/configurations/cord/dataplane/generate-bm.sh b/xos/configurations/cord/dataplane/generate-bm.sh index 25f6fa5..e6053dc 100755 --- a/xos/configurations/cord/dataplane/generate-bm.sh +++ b/xos/configurations/cord/dataplane/generate-bm.sh
@@ -1,4 +1,4 @@ -source ../../common/admin-openrc.sh +source ../../setup/admin-openrc.sh get_ip () { LABEL=$1 @@ -9,7 +9,7 @@ GRENAMES=() BM_IPS=() -NODES=`sudo bash -c "source /root/setup/admin-openrc.sh ; nova hypervisor-list" |grep cloudlab|awk '{print $4}'` +NODES=`sudo bash -c "source ../../setup/admin-openrc.sh ; nova hypervisor-list" |grep enabled|awk '{print $4}'` I=1 for NODE in $NODES; do BM_SSH_IP=`getent hosts $NODE | awk '{ print $1 }'`