summaryrefslogtreecommitdiff
path: root/clusters
diff options
context:
space:
mode:
Diffstat (limited to 'clusters')
-rw-r--r--clusters/cephclient.morph2
-rw-r--r--clusters/ci.morph16
-rw-r--r--clusters/example-distbuild-cluster.morph6
-rw-r--r--clusters/example-swift-storage-cluster.morph4
-rw-r--r--clusters/hardware-deployment.morph6
-rw-r--r--clusters/image-package-example.morph4
-rw-r--r--clusters/initramfs-test.morph4
-rw-r--r--clusters/installer-build-system-x86_64.morph8
-rw-r--r--clusters/jetson-upgrade.morph2
-rw-r--r--clusters/mason-openstack.morph2
-rw-r--r--clusters/mason.morph4
-rw-r--r--clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph2
-rw-r--r--clusters/minimal-system-deploy.morph2
-rw-r--r--clusters/moonshot-m2-armv8b64.morph4
-rw-r--r--clusters/moonshot-pxe-armv8b64.morph2
-rw-r--r--clusters/moonshot-pxe-armv8l64.morph2
-rw-r--r--clusters/openstack-one-node-swift.morph2
-rw-r--r--clusters/openstack-one-node.morph2
-rw-r--r--clusters/openstack-three-node-installer.morph6
-rw-r--r--clusters/openstack-two-node-installer.morph6
-rw-r--r--clusters/release.morph18
-rw-r--r--clusters/sdk-example-cluster.morph4
-rw-r--r--clusters/trove-example.morph4
-rw-r--r--clusters/trove.baserock.org-upgrade.morph2
-rw-r--r--clusters/upgrade-devel.morph2
-rw-r--r--clusters/weston-system-x86_64-generic-deploy.morph4
-rw-r--r--clusters/zookeeper.morph4
27 files changed, 62 insertions, 62 deletions
diff --git a/clusters/cephclient.morph b/clusters/cephclient.morph
index b4db22e0..f9cc04a2 100644
--- a/clusters/cephclient.morph
+++ b/clusters/cephclient.morph
@@ -4,7 +4,7 @@ systems:
- morph: systems/ceph-service-x86_64-generic.morph
deploy:
ceph-node-virtualbox-image:
- type: virtualbox-ssh
+ type: extensions/virtualbox-ssh
SYSTEM: systems/ceph-service-x86_64-generic.morph
location: vbox+ssh://user@machine/ChefNode4/home/user/chefnode4.vdi
# HOST_IPADDR and NETMASK should be set to the IP address and netmask of the virtualbox host on the host-only interface.
diff --git a/clusters/ci.morph b/clusters/ci.morph
index cb56328c..d37733ab 100644
--- a/clusters/ci.morph
+++ b/clusters/ci.morph
@@ -9,19 +9,19 @@ systems:
- morph: systems/devel-system-x86_64-generic.morph
deploy:
devel-system-x86_64-generic:
- type: rawdisk
+ type: extensions/rawdisk
location: devel-system-x86_64-generic.img
DISK_SIZE: 4G
- morph: systems/devel-system-x86_32-generic.morph
deploy:
devel-system-x86_32-generic:
- type: rawdisk
+ type: extensions/rawdisk
location: devel-system-x86_32-generic.img
DISK_SIZE: 4G
- morph: systems/build-system-armv7lhf-jetson.morph
deploy:
build-system-armv7lhf-jetson:
- type: rawdisk
+ type: extensions/rawdisk
location: build-system-armv7lhf-jetson.img
DISK_SIZE: 2G
BOOT_DEVICE: "/dev/mmcblk0p1"
@@ -33,14 +33,14 @@ systems:
- morph: systems/weston-system-x86_64-generic.morph
deploy:
weston-system-x86_64-generic:
- type: rawdisk
+ type: extensions/rawdisk
location: weston-system-x86_64-generic.img
DISK_SIZE: 4G
KERNEL_ARGS: vga=788
- morph: systems/weston-system-armv7lhf-jetson.morph
deploy:
weston-system-armv7lhf-jetson:
- type: rawdisk
+ type: extensions/rawdisk
location: weston-system-armv7lhf-jetson.img
DISK_SIZE: 4G
BOOT_DEVICE: "/dev/mmcblk0p1"
@@ -52,14 +52,14 @@ systems:
- morph: systems/genivi-baseline-system-x86_64-generic.morph
deploy:
genivi-baseline-system-x86_64-generic:
- type: rawdisk
+ type: extensions/rawdisk
location: genivi-baseline-system-x86_64-generic.img
DISK_SIZE: 4G
KERNEL_ARGS: vga=788
- morph: systems/genivi-baseline-system-armv7lhf-jetson.morph
deploy:
genivi-baseline-system-armv7lhf-jetson:
- type: rawdisk
+ type: extensions/rawdisk
location: genivi-baseline-system-armv7lhf-jetson.img
DISK_SIZE: 4G
BOOT_DEVICE: "/dev/mmcblk0p1"
@@ -71,7 +71,7 @@ systems:
- morph: systems/openstack-system-x86_64.morph
deploy:
openstack-system-x86_64:
- type: rawdisk
+ type: extensions/rawdisk
location: baserock-openstack-system-x86_64.img
DISK_SIZE: 5G
INSTALL_FILES: openstack/manifest
diff --git a/clusters/example-distbuild-cluster.morph b/clusters/example-distbuild-cluster.morph
index 513c16c5..b5cd11ef 100644
--- a/clusters/example-distbuild-cluster.morph
+++ b/clusters/example-distbuild-cluster.morph
@@ -22,16 +22,16 @@ systems:
WORKER_SSH_KEY: ssh-keys/worker.key
deploy:
build-controller:
- type: nfsboot
+ type: extensions/nfsboot
location: $MY_TROVE
DISTBUILD_CONTROLLER: true
HOSTNAME: build-controller
WORKERS: build-node-1, build-node-2
build-node-1:
- type: nfsboot
+ type: extensions/nfsboot
location: $MY_TROVE
HOSTNAME: build-node-1
build-node-2:
- type: nfsboot
+ type: extensions/nfsboot
location: $MY_TROVE
HOSTNAME: build-node-2
diff --git a/clusters/example-swift-storage-cluster.morph b/clusters/example-swift-storage-cluster.morph
index b1ea784f..2a512709 100644
--- a/clusters/example-swift-storage-cluster.morph
+++ b/clusters/example-swift-storage-cluster.morph
@@ -39,7 +39,7 @@ systems:
deploy:
node0:
- type: kvm
+ type: extensions/kvm
location: kvm+ssh://user@host/swift-storage-0/home/user/swift-storage-0.img
DISK_SIZE: 10G
RAM_SIZE: 1G
@@ -50,7 +50,7 @@ systems:
MANAGEMENT_INTERFACE_IP_ADDRESS: <node0 management ip>
ATTACH_DISKS: /dev/node0_sdb:/dev/node0_sdc:/dev/node0_sdd
node1:
- type: kvm
+ type: extensions/kvm
location: kvm+ssh://user@host/swift-storage-1/home/user/swift-storage-1.img
DISK_SIZE: 10G
RAM_SIZE: 1G
diff --git a/clusters/hardware-deployment.morph b/clusters/hardware-deployment.morph
index c6b7dce9..674d6587 100644
--- a/clusters/hardware-deployment.morph
+++ b/clusters/hardware-deployment.morph
@@ -8,7 +8,7 @@ systems:
- morph: systems/installer-system-x86_64.morph
deploy:
installer:
- type: pxeboot
+ type: extensions/pxeboot
location: AB:CD:EF:12:34:56:78 #MAC address.
PXEBOOT_MODE: spawn-novlan
PXEBOOT_DEPLOYER_INTERFACE: ens6
@@ -23,7 +23,7 @@ systems:
- morph: systems/build-system-x86_64.morph
deploy:
to-install:
- type: sysroot
+ type: extensions/sysroot
location: /rootfs
INITRAMFS_PATH: boot/initramfs.gz
KERNEL_ARGS: console=ttyS1,9600 console=tty0
@@ -31,5 +31,5 @@ systems:
- morph: systems/initramfs-x86_64.morph
deploy:
initramfs:
- type: initramfs
+ type: extensions/initramfs
location: boot/initramfs.gz
diff --git a/clusters/image-package-example.morph b/clusters/image-package-example.morph
index fd8487e2..ca79ec97 100644
--- a/clusters/image-package-example.morph
+++ b/clusters/image-package-example.morph
@@ -6,7 +6,7 @@ systems:
- morph: systems/base-system-x86_32-generic.morph
deploy:
imgpkg:
- type: image-package
+ type: extensions/image-package
location: image-package-example.tar
BOOTLOADER_BLOBS: /usr/share/syslinux/mbr.bin
- INCLUDE_SCRIPTS: image-package-example/make-disk-image.sh.in:image-package-example/disk-install.sh.in:image-package-example/common.sh.in
+ INCLUDE_SCRIPTS: extensions/image-package-example/make-disk-image.sh.in:extensions/image-package-example/disk-install.sh.in:extensions/image-package-example/common.sh.in
diff --git a/clusters/initramfs-test.morph b/clusters/initramfs-test.morph
index afc94961..dd7d91e1 100644
--- a/clusters/initramfs-test.morph
+++ b/clusters/initramfs-test.morph
@@ -4,7 +4,7 @@ systems:
- morph: systems/base-system-x86_64-generic.morph
deploy:
system:
- type: rawdisk
+ type: extensions/rawdisk
location: initramfs-system-x86_64.img
DISK_SIZE: 1G
HOSTNAME: initramfs-system
@@ -13,5 +13,5 @@ systems:
- morph: systems/initramfs-x86_64.morph
deploy:
initramfs:
- type: initramfs
+ type: extensions/initramfs
location: boot/initramfs.gz
diff --git a/clusters/installer-build-system-x86_64.morph b/clusters/installer-build-system-x86_64.morph
index a9ebcaca..d9a2a28b 100644
--- a/clusters/installer-build-system-x86_64.morph
+++ b/clusters/installer-build-system-x86_64.morph
@@ -24,7 +24,7 @@ systems:
- morph: systems/installer-system-x86_64.morph
deploy:
installer:
- type: rawdisk
+ type: extensions/rawdisk
location: installer-build-system-x86_64.img
KERNEL_ARGS: init=/usr/lib/baserock-installer/installer
DISK_SIZE: 6G
@@ -36,17 +36,17 @@ systems:
- morph: systems/initramfs-x86_64.morph
deploy:
installer-initramfs:
- type: initramfs
+ type: extensions/initramfs
location: boot/initramfs.gz
- morph: systems/build-system-x86_64.morph
deploy:
to-install:
- type: sysroot
+ type: extensions/sysroot
location: /rootfs
INITRAMFS_PATH: boot/initramfs.gz
subsystems:
- morph: systems/initramfs-x86_64.morph
deploy:
to-install-initramfs:
- type: initramfs
+ type: extensions/initramfs
location: boot/initramfs.gz
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph
index 9fd5155b..e6ec97e0 100644
--- a/clusters/jetson-upgrade.morph
+++ b/clusters/jetson-upgrade.morph
@@ -14,5 +14,5 @@ systems:
FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2
deploy:
self:
- type: ssh-rsync
+ type: extensions/ssh-rsync
location: root@127.0.0.1
diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph
index 6ef14888..915e14e7 100644
--- a/clusters/mason-openstack.morph
+++ b/clusters/mason-openstack.morph
@@ -18,7 +18,7 @@ systems:
WORKER_SSH_KEY: ssh-keys/worker.key
deploy:
mason-openstack:
- type: openstack
+ type: extensions/openstack
location: openstack-auth-url (eg example.com:5000/v2.0)
DISK_SIZE: 6G
DISTBUILD_CONTROLLER: true
diff --git a/clusters/mason.morph b/clusters/mason.morph
index 9717239d..21399ea0 100644
--- a/clusters/mason.morph
+++ b/clusters/mason.morph
@@ -11,7 +11,7 @@ systems:
- morph: systems/trove-system-x86_64.morph
deploy:
red-box-v1-trove:
- type: kvm
+ type: extensions/kvm
location: kvm+ssh://vm-user@vm-host/red-box-v1-trove/vm-path/red-box-v1-trove.img
AUTOSTART: true
DISK_SIZE: 20G
@@ -44,7 +44,7 @@ systems:
WORKER_SSH_KEY: ssh_keys/worker.key
deploy:
red-box-v1-controller:
- type: kvm
+ type: extensions/kvm
location: kvm+ssh://vm-user@vm-host/red-box-v1-controller/vm-path/red-box-v1-controller.img
DISK_SIZE: 60G
DISTBUILD_CONTROLLER: true
diff --git a/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph b/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph
index eea600cf..9647e7a7 100644
--- a/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph
+++ b/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph
@@ -4,7 +4,7 @@ systems:
- morph: systems/minimal-system-armv5l-openbmc-aspeed.morph
deploy:
minimal-system-armv5l-openbmc-aspeed:
- type: jffs2
+ type: extensions/jffs2
location: minimal-system-armv5l-openbmc-aspeed.img
ROOT_DEVICE: "/dev/mtdblock"
BOOTLOADER_CONFIG_FORMAT: "extlinux"
diff --git a/clusters/minimal-system-deploy.morph b/clusters/minimal-system-deploy.morph
index 06629ffc..cf8de54f 100644
--- a/clusters/minimal-system-deploy.morph
+++ b/clusters/minimal-system-deploy.morph
@@ -6,7 +6,7 @@ systems:
- morph: systems/minimal-system-x86_32-generic.morph
deploy:
vm:
- type: kvm
+ type: extensions/kvm
location: kvm+ssh://192.168.122.1/tiny-x86_32/srv/VMs/tiny-x86_32.img
DISK_SIZE: 512M
HOSTNAME: tiny-x86_32
diff --git a/clusters/moonshot-m2-armv8b64.morph b/clusters/moonshot-m2-armv8b64.morph
index c8e5bc81..c46b1d9e 100644
--- a/clusters/moonshot-m2-armv8b64.morph
+++ b/clusters/moonshot-m2-armv8b64.morph
@@ -8,7 +8,7 @@ systems:
- morph: systems/installer-system-armv8b64.morph
deploy:
installer:
- type: pxeboot
+ type: extensions/pxeboot
location: 14:58:d0:57:7f:42
PXEBOOT_MODE: existing-server
PXEBOOT_CONFIG_TFTP_ADDRESS: sftp://192.168.0.1/srv/nfsboot/tftp/
@@ -44,7 +44,7 @@ systems:
- morph: systems/devel-system-armv8b64.morph
deploy:
to-install:
- type: sysroot
+ type: extensions/sysroot
location: /rootfs
HOSTNAME: baserock-c31n1
DTB_PATH: boot/m400-1003.dtb
diff --git a/clusters/moonshot-pxe-armv8b64.morph b/clusters/moonshot-pxe-armv8b64.morph
index 2d32efb0..a16a3602 100644
--- a/clusters/moonshot-pxe-armv8b64.morph
+++ b/clusters/moonshot-pxe-armv8b64.morph
@@ -9,7 +9,7 @@ systems:
- morph: systems/devel-system-armv8b64.morph
deploy:
netboot:
- type: pxeboot
+ type: extensions/pxeboot
location: 14:58:d0:57:7f:42
PXEBOOT_MODE: existing-server
PXEBOOT_CONFIG_TFTP_ADDRESS: sftp://192.168.0.1/srv/nfsboot/tftp/
diff --git a/clusters/moonshot-pxe-armv8l64.morph b/clusters/moonshot-pxe-armv8l64.morph
index 3286c72e..9fd7cee7 100644
--- a/clusters/moonshot-pxe-armv8l64.morph
+++ b/clusters/moonshot-pxe-armv8l64.morph
@@ -9,7 +9,7 @@ systems:
- morph: systems/devel-system-armv8l64.morph
deploy:
netboot:
- type: pxeboot
+ type: extensions/pxeboot
location: 14:58:d0:57:7f:42
PXEBOOT_MODE: existing-server
PXEBOOT_CONFIG_TFTP_ADDRESS: sftp://192.168.0.1/srv/nfsboot/tftp/
diff --git a/clusters/openstack-one-node-swift.morph b/clusters/openstack-one-node-swift.morph
index 588b6e81..37429283 100644
--- a/clusters/openstack-one-node-swift.morph
+++ b/clusters/openstack-one-node-swift.morph
@@ -40,7 +40,7 @@ systems:
- morph: systems/openstack-system-x86_64.morph
deploy:
release:
- type: rawdisk
+ type: extensions/rawdisk
location: baserock-openstack-system-x86_64.img
DISK_SIZE: 10G
INSTALL_FILES: openstack/manifest swift/manifest
diff --git a/clusters/openstack-one-node.morph b/clusters/openstack-one-node.morph
index 037cd23c..d6b4c582 100644
--- a/clusters/openstack-one-node.morph
+++ b/clusters/openstack-one-node.morph
@@ -40,7 +40,7 @@ systems:
- morph: systems/openstack-system-x86_64.morph
deploy:
release:
- type: rawdisk
+ type: extensions/rawdisk
location: baserock-openstack-system-x86_64.img
DISK_SIZE: 10G
INSTALL_FILES: openstack/manifest
diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph
index 6285217a..afad454a 100644
--- a/clusters/openstack-three-node-installer.morph
+++ b/clusters/openstack-three-node-installer.morph
@@ -59,7 +59,7 @@ systems:
- morph: systems/installer-system-x86_64.morph
deploy:
network-installer: &installer
- type: rawdisk
+ type: extensions/rawdisk
location: installer-openstack-network-x86_64.img
KERNEL_ARGS: init=/usr/lib/baserock-installer/installer
DISK_SIZE: 6G
@@ -72,12 +72,12 @@ systems:
- morph: systems/initramfs-x86_64.morph
deploy:
network-initramfs: &initramfs
- type: initramfs
+ type: extensions/initramfs
location: boot/initramfs.gz
- morph: systems/openstack-system-x86_64.morph
deploy:
network-to-install: &stack-node
- type: sysroot
+ type: extensions/sysroot
location: rootfs
INSTALL_FILES: openstack/manifest
INITRAMFS_PATH: boot/initramfs.gz
diff --git a/clusters/openstack-two-node-installer.morph b/clusters/openstack-two-node-installer.morph
index f05b0e9b..53d0b7b1 100644
--- a/clusters/openstack-two-node-installer.morph
+++ b/clusters/openstack-two-node-installer.morph
@@ -58,7 +58,7 @@ systems:
- morph: systems/installer-system-x86_64.morph
deploy:
controller-installer: &installer
- type: rawdisk
+ type: extensions/rawdisk
location: installer-openstack-controller-x86_64.img
KERNEL_ARGS: init=/usr/lib/baserock-installer/installer
DISK_SIZE: 6G
@@ -71,12 +71,12 @@ systems:
- morph: systems/initramfs-x86_64.morph
deploy:
controller-initramfs: &initramfs
- type: initramfs
+ type: extensions/initramfs
location: boot/initramfs.gz
- morph: systems/openstack-system-x86_64.morph
deploy:
controller-to-install: &stack-node
- type: sysroot
+ type: extensions/sysroot
location: rootfs
INSTALL_FILES: openstack/manifest
INITRAMFS_PATH: boot/initramfs.gz
diff --git a/clusters/release.morph b/clusters/release.morph
index c5bfffca..1574bde6 100644
--- a/clusters/release.morph
+++ b/clusters/release.morph
@@ -10,23 +10,23 @@ systems:
- morph: systems/build-system-x86_32-chroot.morph
deploy:
build-system-x86_32-chroot:
- type: tar
+ type: extensions/tar
location: build-system-x86_32-chroot.tar
- morph: systems/build-system-x86_32.morph
deploy:
build-system-x86_32:
- type: rawdisk
+ type: extensions/rawdisk
location: build-system-x86_32.img
DISK_SIZE: 6G
- morph: systems/build-system-x86_64-chroot.morph
deploy:
build-system-x86_64-chroot:
- type: tar
+ type: extensions/tar
location: build-system-x86_64-chroot.tar
- morph: systems/build-system-x86_64.morph
deploy:
build-system-x86_64:
- type: rawdisk
+ type: extensions/rawdisk
location: build-system-x86_64.img
DISK_SIZE: 6G
INITRAMFS_PATH: boot/initramfs.gz
@@ -34,12 +34,12 @@ systems:
- morph: systems/initramfs-x86_64.morph
deploy:
initramfs-build-system-x86_64:
- type: initramfs
+ type: extensions/initramfs
location: boot/initramfs.gz
- morph: systems/build-system-armv7lhf-jetson.morph
deploy:
build-system-armv7lhf-jetson:
- type: rawdisk
+ type: extensions/rawdisk
location: build-system-armv7lhf-jetson.img
DISK_SIZE: 2G
BOOT_DEVICE: "/dev/mmcblk0p1"
@@ -51,7 +51,7 @@ systems:
- morph: systems/genivi-baseline-system-x86_64-generic.morph
deploy:
genivi-baseline-system-x86_64-generic:
- type: rawdisk
+ type: extensions/rawdisk
location: genivi-baseline-system-x86_64-generic.img
DISK_SIZE: 4G
KERNEL_ARGS: vga=788
@@ -60,12 +60,12 @@ systems:
- morph: systems/initramfs-x86_64.morph
deploy:
initramfs-genivi-baseline-system-x86_64-generic:
- type: initramfs
+ type: extensions/initramfs
location: boot/initramfs.gz
- morph: systems/genivi-baseline-system-armv7lhf-jetson.morph
deploy:
genivi-baseline-system-armv7lhf-jetson:
- type: rawdisk
+ type: extensions/rawdisk
location: genivi-baseline-system-armv7lhf-jetson.img
DISK_SIZE: 4G
BOOT_DEVICE: "/dev/mmcblk0p1"
diff --git a/clusters/sdk-example-cluster.morph b/clusters/sdk-example-cluster.morph
index 92e4a413..a4413c3b 100644
--- a/clusters/sdk-example-cluster.morph
+++ b/clusters/sdk-example-cluster.morph
@@ -34,7 +34,7 @@ systems:
- morph: systems/armv7lhf-cross-toolchain-system-x86_64.morph
deploy:
sdk:
- type: sdk
+ type: extensions/sdk
location: armv7lhf-cross-toolchain-system-x86_64.sh
PREFIX: /usr
TARGET: armv7lhf-baserock-linux-gnueabi
@@ -42,5 +42,5 @@ systems:
- morph: systems/devel-system-armv7lhf-highbank.morph
deploy:
sysroot:
- type: sysroot
+ type: extensions/sysroot
location: usr/armv7lhf-baserock-linux-gnueabi/sys-root
diff --git a/clusters/trove-example.morph b/clusters/trove-example.morph
index 2812f60e..81b1c901 100644
--- a/clusters/trove-example.morph
+++ b/clusters/trove-example.morph
@@ -50,9 +50,9 @@ systems:
UPSTREAM_TROVE: ''
deploy:
initial:
- type: kvm
+ type: extensions/kvm
location: kvm+ssh://vm-user@vm-host/test-trove/vm-path/test-trove.img
VERSION_LABEL: 1
upgrade:
- type: ssh-rsync
+ type: extensions/ssh-rsync
location: test-trove
diff --git a/clusters/trove.baserock.org-upgrade.morph b/clusters/trove.baserock.org-upgrade.morph
index eaf939e1..e66fd6bc 100644
--- a/clusters/trove.baserock.org-upgrade.morph
+++ b/clusters/trove.baserock.org-upgrade.morph
@@ -13,7 +13,7 @@ systems:
- morph: systems/trove-system-x86_64.morph
deploy:
gbo:
- type: ssh-rsync
+ type: extensions/ssh-rsync
location: root@git.baserock.org
FSTAB_HOME: LABEL=homes /home auto defaults,noatime,rw 0 2
HOSTNAME: firehose1
diff --git a/clusters/upgrade-devel.morph b/clusters/upgrade-devel.morph
index b7ce9bc0..3efbb36a 100644
--- a/clusters/upgrade-devel.morph
+++ b/clusters/upgrade-devel.morph
@@ -35,5 +35,5 @@ systems:
- morph: systems/devel-system-x86_64-generic.morph
deploy:
self:
- type: ssh-rsync
+ type: extensions/ssh-rsync
location: root@127.0.0.1
diff --git a/clusters/weston-system-x86_64-generic-deploy.morph b/clusters/weston-system-x86_64-generic-deploy.morph
index 3a6f29ef..65e35bd7 100644
--- a/clusters/weston-system-x86_64-generic-deploy.morph
+++ b/clusters/weston-system-x86_64-generic-deploy.morph
@@ -10,7 +10,7 @@ systems:
- morph: systems/weston-system-x86_64-generic.morph
deploy:
weston-system-x86_64-generic:
- type: rawdisk
+ type: extensions/rawdisk
location: /weston-system-x86_64-generic.img
DISK_SIZE: 4G
KERNEL_ARGS: vga=788
@@ -19,5 +19,5 @@ systems:
- morph: systems/initramfs-x86_64.morph
deploy:
initramfs:
- type: initramfs
+ type: extensions/initramfs
location: boot/initramfs.gz
diff --git a/clusters/zookeeper.morph b/clusters/zookeeper.morph
index 1153d4b0..cca6db81 100644
--- a/clusters/zookeeper.morph
+++ b/clusters/zookeeper.morph
@@ -4,7 +4,7 @@ systems:
- morph: systems/zookeeper-client-x86_64.morph
deploy:
my-client-system:
- type: kvm
+ type: extensions/kvm
location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-client.img
DISK_SIZE: 4G
RAM_SIZE: 1G
@@ -13,7 +13,7 @@ systems:
- morph: systems/zookeeper-server-x86_64.morph
deploy:
my-server-system:
- type: kvm
+ type: extensions/kvm
location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-server.img
DISK_SIZE: 4G
RAM_SIZE: 1G