commit 9f362d3ab6e73f814b2b4c685a4eab5891fc226f
author Jenkins <jenkins@review.openstack.org> Mon Feb 16 22:04:23 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon Feb 16 22:04:23 2015 +0000
tree f04502312a382480cc8646b9ddd52e3689ef11af
parent b2b19040d43ff42d6f6a11c5332ee32b153e1015
parent 0df75a7288ec0e8e9fa6f861afd7db676a73e6d1

Merge "XenAPI: Move where os-vpx is set"

tools/xen/install_os_domU.sh

diff --git a/tools/xen/install_os_domU.sh b/tools/xen/install_os_domU.sh
index 8a07251..f28ae97 100755
--- a/tools/xen/install_os_domU.sh
+++ b/tools/xen/install_os_domU.sh
@@ -258,6 +258,7 @@
 #
 # 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"

tools/xen/scripts/install-os-vpx.sh

diff --git a/tools/xen/scripts/install-os-vpx.sh b/tools/xen/scripts/install-os-vpx.sh
index b9b65fd..1ebbeaf 100755
--- a/tools/xen/scripts/install-os-vpx.sh
+++ b/tools/xen/scripts/install-os-vpx.sh
@@ -131,5 +131,4 @@
 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"