Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[agent|stemcell] Fix stemcell2 builder for OpenStack images booted on…

… Xen

Fixed the stemcell2 builder when creating images for OpenStack that will
be booted under Xen (XCP or XenServer) hypervisor:
- persist stemcell_hypervisor var value
- change disk and container format to raw-bare to use Xen pygrub (use kernel
  and ramdisk stored at the image)
- added some image properties to help identify xen the type of image (this
  properties will be read later by the CPI and added to the OpenStack
  glance image properties)

Change-Id: I07885e14578e1f7ef3b9487a54315f1825a88f43
  • Loading branch information...
commit e470a5add38a8d2446be59c040ef529d27a3506e 1 parent be2dee3
@frodenas frodenas authored
View
9 agent/misc/stemcell/build2/stages/stemcell_openstack/apply.sh
@@ -20,9 +20,11 @@ hypervisor = "${stemcell_hypervisor:-kvm}"
case hypervisor
when "kvm"
+ container_format = "bare"
disk_format = "qcow2"
when "xen"
- disk_format = "ami"
+ container_format = "bare"
+ disk_format = "raw"
end
manifest = {
@@ -34,7 +36,10 @@ manifest = {
"version" => version,
"infrastructure" => stemcell_infrastructure,
"disk_format" => disk_format,
- "container_format" => "bare"
+ "container_format" => container_format,
+ "os_type" => "linux",
+ "architecture" => "x86_64",
+ "auto_disk_config" => "true"
}
}
View
1  agent/misc/stemcell/build2/stages/stemcell_openstack/config.sh
@@ -33,5 +33,6 @@ fi
persist_value stemcell_name
persist_value stemcell_version
persist_value stemcell_infrastructure
+persist_value stemcell_hypervisor
persist_value bosh_protocol_version
persist_value ruby_bin
Please sign in to comment.
Something went wrong with that request. Please try again.