1. devstack
  2. Commit 0df75a7288ec0e8e9fa6f861afd7db676a73e6d1
Browse code

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

Bob Ball authored on 2015/02/12 20:59:46
Showing 2 changed files
tools/xen/install_os_domU.sh
History View file @ 0df75a7
... ... 
@@ -258,6 +258,7 @@ fi
258 258 
 #
259 259 
 # Prepare VM for DevStack
260 260 
 #
261 
+xe vm-param-set other-config:os-vpx=true uuid="$vm_uuid"
261 262
262 263 
 # Install XenServer tools, and other such things
263 264 
 $THIS_DIR/prepare_guest_template.sh "$GUEST_NAME"
tools/xen/scripts/install-os-vpx.sh
History View file @ 0df75a7
... ... 
@@ -131,5 +131,4 @@ vm_uuid=$(xe_min vm-install template="$TEMPLATE_NAME" new-name-label="$NAME_LABE
131 131 
 destroy_vifs "$vm_uuid"
132 132 
 set_auto_start "$vm_uuid"
133 133 
 create_vif "$vm_uuid"
134 
-xe vm-param-set other-config:os-vpx=true uuid="$vm_uuid"
135 134 
 xe vm-param-set actions-after-reboot=Destroy uuid="$vm_uuid"