x/xenapi-os-testing
Code Issues Proposed changes

Merge pull request #40 from matelakat/fix-appliance-name

Browse Source 
Fix appliance name
This commit is contained in:
matelakat 2014-02-12 10:41:57 +00:00
commit e7a3abe78b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
launch-node.sh
View File

@ -8,6 +8,7 @@ KEY_PATH="$2"
IMAGE="node" IMAGE="node"
INSTANCE_NAME="$3" INSTANCE_NAME="$3"
FLAVOR="$4" FLAVOR="$4"
APPLIANCE_NAME="Devstack"
. $THISDIR/functions . $THISDIR/functions
@ -40,7 +41,7 @@ FEED_WITH_NOTHING="< /dev/null"
cat << EOF cat << EOF
set -eux set -eux
# Get some parameters # Get some parameters
APP=\$($SSH_DOM0 xe vm-list name-label=Appliance --minimal $FEED_WITH_NOTHING) APP=\$($SSH_DOM0 xe vm-list name-label=$APPLIANCE_NAME --minimal $FEED_WITH_NOTHING)
# Create a vm network # Create a vm network
VMNET=\$($SSH_DOM0 xe network-create name-label=vmnet $FEED_WITH_NOTHING) VMNET=\$($SSH_DOM0 xe network-create name-label=vmnet $FEED_WITH_NOTHING)

3
update-node-image.sh
View File

@ -11,6 +11,7 @@ KEY_PATH="$2"
INSTANCE_NAME="$3" INSTANCE_NAME="$3"
NODE_IMAGE="node" NODE_IMAGE="node"
FLAVOR="$4" FLAVOR="$4"
APPLIANCE_NAME="Devstack"
# Use this configuration to start with a cloud image # Use this configuration to start with a cloud image
IMAGE="62df001e-87ee-407c-b042-6f4e13f5d7e1" IMAGE="62df001e-87ee-407c-b042-6f4e13f5d7e1"
@ -50,7 +51,7 @@ EOF
} | remote-bash root@$IP } | remote-bash root@$IP
remote-bash root@$IP << EOF remote-bash root@$IP << EOF
bash /opt/xenapi-in-the-cloud/convert_node_to_xenserver.sh $XENSERVER_PASSWORD $APPLIANCE_URL Devstack bash /opt/xenapi-in-the-cloud/convert_node_to_xenserver.sh $XENSERVER_PASSWORD $APPLIANCE_URL $APPLIANCE_NAME
EOF EOF
TSTAMP=$(date +%s) TSTAMP=$(date +%s)