From 0df75a7288ec0e8e9fa6f861afd7db676a73e6d1 Mon Sep 17 00:00:00 2001 From: Bob Ball Date: Thu, 12 Feb 2015 11:59:46 +0000 Subject: [PATCH] XenAPI: Move where os-vpx is set os-vpx is only true after we know it's not a JEOS we're creating Move the location we set the os-vpx flag to as we're starting to prepare the VM for devstack Change-Id: If736f3a7de171b8090b0bb905e04accb70470a90 --- tools/xen/install_os_domU.sh | 1 + tools/xen/scripts/install-os-vpx.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xen/install_os_domU.sh b/tools/xen/install_os_domU.sh index 8a0725152f..f28ae97940 100755 --- a/tools/xen/install_os_domU.sh +++ b/tools/xen/install_os_domU.sh @@ -258,6 +258,7 @@ fi # # Prepare VM for DevStack # +xe vm-param-set other-config:os-vpx=true uuid="$vm_uuid" # Install XenServer tools, and other such things $THIS_DIR/prepare_guest_template.sh "$GUEST_NAME" diff --git a/tools/xen/scripts/install-os-vpx.sh b/tools/xen/scripts/install-os-vpx.sh index b9b65fdce2..1ebbeaf564 100755 --- a/tools/xen/scripts/install-os-vpx.sh +++ b/tools/xen/scripts/install-os-vpx.sh @@ -131,5 +131,4 @@ vm_uuid=$(xe_min vm-install template="$TEMPLATE_NAME" new-name-label="$NAME_LABE destroy_vifs "$vm_uuid" set_auto_start "$vm_uuid" create_vif "$vm_uuid" -xe vm-param-set other-config:os-vpx=true uuid="$vm_uuid" xe vm-param-set actions-after-reboot=Destroy uuid="$vm_uuid"