Add a simple templating system to Baserock definitionssam/easy-templating

This is currently independent of the actual definitions format. The
'configure' tool generates actual .morph files from .morph.in files,
and build tools then operate on these generated .morph files.t

This is largely untested and no doubt broken!

36 files changed, 55 insertions, 55 deletions

diff --git a/clusters/altera-socfpga-devkit-sd-image.morph b/clusters/altera-socfpga-devkit-sd-image.morph.in
index 71d3da2d..d7b5255c 100644
--- a/clusters/altera-socfpga-devkit-sd-image.morph
+++ b/clusters/altera-socfpga-devkit-sd-image.morph.in
@@ -1,14 +1,14 @@
 name: altera-socfpga-devkit-sd-image
 kind: cluster
 description: |
-  This cluster morph deploys a little endian Baserock system to
+  This cluster morph deploys a Baserock system to
   an SD image for the Altera Cyclone V development kit
 systems:
-- morph: systems/build-system-armv7l-altera-socfpga-devkit.morph
+- morph: systems/build-system.{{CONFIG}}.morph
   deploy:
     self:
       type: extensions/rawdisk
-      location: build-system-armv7l-altera-socfpga-devkit.img
+      location: build-system.{{CONFIG}}.img
       DISK_SIZE: 7G
       USE_PARTITIONING: yes
       PARTITION_FILE: partitioning/socfpga-devkit
diff --git a/clusters/cephclient.morph b/clusters/cephclient.morph.in
index 9eaf92ee..42ea33f7 100644
--- a/clusters/cephclient.morph
+++ b/clusters/cephclient.morph.in
@@ -1,11 +1,11 @@
 name: ceph-cluster
 kind: cluster
 systems:
-- morph: systems/ceph-service-x86_64-generic.morph
+- morph: systems/ceph-service.{{CONFIG}}.morph
   deploy:
     ceph-node-virtualbox-image:
       type: extensions/virtualbox-ssh
-      SYSTEM: systems/ceph-service-x86_64-generic.morph
+      SYSTEM: systems/ceph-service.{{CONFIG}}.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.
       #HOST_IPADDR: 10.0.100.100
diff --git a/clusters/ci.morph b/clusters/ci.morph.in
index a7469512..a7469512 100644
--- a/clusters/ci.morph
+++ b/clusters/ci.morph.in
diff --git a/clusters/example-ceph-cluster-on-openstack.morph b/clusters/example-ceph-cluster-on-openstack.morph.in
index 6ddabc90..6ddabc90 100644
--- a/clusters/example-ceph-cluster-on-openstack.morph
+++ b/clusters/example-ceph-cluster-on-openstack.morph.in
diff --git a/clusters/example-distbuild-cluster.morph b/clusters/example-distbuild-cluster.morph.in
index 5208a5ca..5208a5ca 100644
--- a/clusters/example-distbuild-cluster.morph
+++ b/clusters/example-distbuild-cluster.morph.in
diff --git a/clusters/example-swift-storage-cluster.morph b/clusters/example-swift-storage-cluster.morph.in
index ddab6481..ddab6481 100644
--- a/clusters/example-swift-storage-cluster.morph
+++ b/clusters/example-swift-storage-cluster.morph.in
diff --git a/clusters/gdp-jetson-upgrade.morph b/clusters/gdp-jetson-upgrade.morph.in
index 33eb8ec1..33eb8ec1 100644
--- a/clusters/gdp-jetson-upgrade.morph
+++ b/clusters/gdp-jetson-upgrade.morph.in
diff --git a/clusters/gnome-system-armv7lhf-jetson-deploy.morph b/clusters/gnome-system-armv7lhf-jetson-deploy.morph.in
index c74f1209..c74f1209 100644
--- a/clusters/gnome-system-armv7lhf-jetson-deploy.morph
+++ b/clusters/gnome-system-armv7lhf-jetson-deploy.morph.in
diff --git a/clusters/gnome-system-x86_64-deploy.morph b/clusters/gnome-system-deploy.morph.in
index b3015ff2..b3015ff2 100644
--- a/clusters/gnome-system-x86_64-deploy.morph
+++ b/clusters/gnome-system-deploy.morph.in
diff --git a/clusters/hardware-deployment.morph b/clusters/hardware-deployment.morph.in
index 674d6587..674d6587 100644
--- a/clusters/hardware-deployment.morph
+++ b/clusters/hardware-deployment.morph.in
diff --git a/clusters/image-package-example.morph b/clusters/image-package-example.morph.in
index ca79ec97..ca79ec97 100644
--- a/clusters/image-package-example.morph
+++ b/clusters/image-package-example.morph.in
diff --git a/clusters/initramfs-test.morph b/clusters/initramfs-test.morph.in
index a4ce7f32..a4ce7f32 100644
--- a/clusters/initramfs-test.morph
+++ b/clusters/initramfs-test.morph.in
diff --git a/clusters/installer-build-system-x86_64.morph b/clusters/installer-build-system-x86_64.morph.in
index d9a2a28b..d9a2a28b 100644
--- a/clusters/installer-build-system-x86_64.morph
+++ b/clusters/installer-build-system-x86_64.morph.in
diff --git a/clusters/ivi-system-armv7lhf-jetson-deploy.morph b/clusters/ivi-system-armv7lhf-jetson-deploy.morph
index fef89351..9e3e3cd6 100644
--- a/clusters/ivi-system-armv7lhf-jetson-deploy.morph
+++ b/clusters/ivi-system-armv7lhf-jetson-deploy.morph
@@ -1,8 +1,8 @@
 name: ivi-system-armv7lhf-jetson-deploy
 kind: cluster
-description: Deploy a IVI system.
+description: Deploy a IVI system for an NVIDIA Jetson.
 systems:
-- morph: systems/ivi-system-armv7lhf-jetson.morph
+- morph: systems/ivi-system.armv7lhf-jetson.morph
   deploy:
     ivi-system-armv7lhf-jetson:
       type: extensions/rawdisk
diff --git a/clusters/ivi-system-x86_64-deploy.morph b/clusters/ivi-system-deploy.morph.in
index 0833ec8c..f5ed3340 100644
--- a/clusters/ivi-system-x86_64-deploy.morph
+++ b/clusters/ivi-system-deploy.morph.in
@@ -1,4 +1,4 @@
-name: ivi-system-x86_64-deploy
+name: ivi-system-deploy
 kind: cluster
 description: |
   Deploy a stock IVI system.
@@ -7,17 +7,17 @@ description: |
   as well as in a virtual machine.
 
 systems:
-- morph: systems/ivi-system-x86_64.morph
+- morph: systems/ivi-system.{{CONFIG}}.morph
   deploy:
     ivi-system-x86_64:
       type: extensions/rawdisk
-      location: /ivi-system-x86_64.img
-      HOSTNAME: ivi-system-x86-64
+      location: /ivi-system.img
+      HOSTNAME: ivi-system
       DISK_SIZE: 6G
       KERNEL_ARGS: vga=788
       INITRAMFS_PATH: boot/initramfs.gz
   subsystems:
-  - morph: systems/initramfs-x86_64.morph
+  - morph: systems/initramfs.morph
     deploy:
       initramfs:
         type: initramfs
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph.in
index c8ac0681..c8ac0681 100644
--- a/clusters/jetson-upgrade.morph
+++ b/clusters/jetson-upgrade.morph.in
diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph.in
index cc7c1d4d..cc7c1d4d 100644
--- a/clusters/mason-openstack.morph
+++ b/clusters/mason-openstack.morph.in
diff --git a/clusters/mason.morph b/clusters/mason.morph.in
index 376cf337..376cf337 100644
--- a/clusters/mason.morph
+++ b/clusters/mason.morph.in
diff --git a/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph b/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph
index 3154fa26..931b9b11 100644
--- a/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph
+++ b/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph
@@ -1,7 +1,7 @@
 name: minimal-system-armv5l-openbmc-aspeed-deploy
 kind: cluster
 systems:
-- morph: systems/minimal-system-armv5l-openbmc-aspeed.morph
+- morph: systems/minimal-system.armv5l-openbmc-aspeed.morph
   deploy:
     minimal-system-armv5l-openbmc-aspeed:
       type: extensions/jffs2
diff --git a/clusters/minimal-system-deploy.morph b/clusters/minimal-system-deploy.morph.in
index cf8de54f..cf8de54f 100644
--- a/clusters/minimal-system-deploy.morph
+++ b/clusters/minimal-system-deploy.morph.in
diff --git a/clusters/moonshot-m2-armv8b64.morph b/clusters/moonshot-m2-armv8b64.morph
index caa460c3..d14b4435 100644
--- a/clusters/moonshot-m2-armv8b64.morph
+++ b/clusters/moonshot-m2-armv8b64.morph
@@ -5,7 +5,7 @@ description: |
   Moonshot node, using a combination of the pxeboot.write extension and
   the installer system.
 systems:
-- morph: systems/installer-system-armv8b64.morph
+- morph: systems/installer-system.armv8b64.morph
   deploy:
     installer:
       type: extensions/pxeboot
@@ -41,7 +41,7 @@ systems:
       INSTALL_FILES: install-files/moonshot/manifest
       MOONSHOT_KERNEL: true
   subsystems:
-  - morph: systems/devel-system-armv8b64.morph
+  - morph: systems/devel-system.armv8b64.morph
     deploy:
       to-install:
         type: extensions/sysroot
diff --git a/clusters/moonshot-pxe-armv8b64.morph b/clusters/moonshot-pxe-armv8b64.morph
index af59817a..2b723b11 100644
--- a/clusters/moonshot-pxe-armv8b64.morph
+++ b/clusters/moonshot-pxe-armv8b64.morph
@@ -6,7 +6,7 @@ description: |
   The system will be configured to boot through PXE from existing DHCP,
   TFTP and NFS servers.
 systems:
-- morph: systems/devel-system-armv8b64.morph
+- morph: systems/devel-system.armv8b64.morph
   deploy:
     netboot:
       type: extensions/pxeboot
diff --git a/clusters/moonshot-pxe-armv8l64.morph b/clusters/moonshot-pxe-armv8l64.morph
index 80771d52..def8a0bd 100644
--- a/clusters/moonshot-pxe-armv8l64.morph
+++ b/clusters/moonshot-pxe-armv8l64.morph
@@ -6,7 +6,7 @@ description: |
   The system will be configured to boot through PXE from existing DHCP,
   TFTP and NFS servers.
 systems:
-- morph: systems/devel-system-armv8l64.morph
+- morph: systems/devel-system.armv8l64.morph
   deploy:
     netboot:
       type: extensions/pxeboot
diff --git a/clusters/openstack-one-node-swift.morph b/clusters/openstack-one-node-swift.morph.in
index fc289538..fc289538 100644
--- a/clusters/openstack-one-node-swift.morph
+++ b/clusters/openstack-one-node-swift.morph.in
diff --git a/clusters/openstack-one-node.morph b/clusters/openstack-one-node.morph.in
index 12985463..12985463 100644
--- a/clusters/openstack-one-node.morph
+++ b/clusters/openstack-one-node.morph.in
diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph.in
index 144f29f2..144f29f2 100644
--- a/clusters/openstack-three-node-installer.morph
+++ b/clusters/openstack-three-node-installer.morph.in
diff --git a/clusters/openstack-two-node-installer.morph b/clusters/openstack-two-node-installer.morph.in
index 0c08bd4f..0c08bd4f 100644
--- a/clusters/openstack-two-node-installer.morph
+++ b/clusters/openstack-two-node-installer.morph.in
diff --git a/clusters/release-genivi-baseline.morph b/clusters/release-genivi-baseline.morph.in
index f7e07042..f7e07042 100644
--- a/clusters/release-genivi-baseline.morph
+++ b/clusters/release-genivi-baseline.morph.in
diff --git a/clusters/release.morph b/clusters/release.morph.in
index fe07665f..5af66ab0 100644
--- a/clusters/release.morph
+++ b/clusters/release.morph.in
@@ -7,50 +7,50 @@ description: |
   you can deploy the systems yourself, if you are making a Baserock release
   then the script should be used.
 systems:
-- morph: systems/build-system-x86_32-chroot.morph
+- morph: systems/build-system.x86_32-chroot.morph
   deploy:
     build-system-x86_32-chroot:
       type: extensions/tar
-      location: build-system-x86_32-chroot.tar
-      HOSTNAME: build-system-x86-32-chroot
-- morph: systems/build-system-x86_32.morph
+      location: build-system.x86_32-chroot.tar
+      HOSTNAME: build-system.x86-32-chroot
+- morph: systems/build-system.x86_32.morph
   deploy:
     build-system-x86_32:
       type: extensions/rawdisk
-      location: build-system-x86_32.img
+      location: build-system.x86_32.img
       DISK_SIZE: 6G
-      HOSTNAME: build-system-x86-32
-- morph: systems/build-system-x86_64-chroot.morph
+      HOSTNAME: build-system.x86-32
+- morph: systems/build-system.x86_64-chroot.morph
   deploy:
     build-system-x86_64-chroot:
       type: extensions/tar
-      location: build-system-x86_64-chroot.tar
+      location: build-system.x86_64-chroot.tar
       HOSTNAME: build-system-x86-64-chroot
-- morph: systems/build-system-x86_64.morph
+- morph: systems/build-system.x86_64.morph
   deploy:
     build-system-x86_64:
       type: extensions/rawdisk
-      location: build-system-x86_64.img
+      location: build-system.x86_64.img
       DISK_SIZE: 6G
       INITRAMFS_PATH: boot/initramfs.gz
       HOSTNAME: build-system-x86-64
   subsystems:
-  - morph: systems/initramfs-x86_64.morph
+  - morph: systems/initramfs.x86_64.morph
     deploy:
       initramfs-build-system-x86_64:
         type: extensions/initramfs
         location: boot/initramfs.gz
-- morph: systems/build-system-armv7lhf-rootfs.morph
+- morph: systems/build-system.armv7lhf-rootfs.morph
   deploy:
     build-system-armv7lhf-rootfs:
       type: extensions/tar
-      location: build-system-armv7lhf-rootfs.tar
-      HOSTNAME: build-system-armv7lhf-rootfs
-- morph: systems/build-system-armv7lhf-jetson.morph
+      location: build-system.armv7lhf-rootfs.tar
+      HOSTNAME: build-system.armv7lhf-rootfs
+- morph: systems/build-system.armv7lhf-jetson.morph
   deploy:
     build-system-armv7lhf-jetson:
       type: extensions/rawdisk
-      location: build-system-armv7lhf-jetson.img
+      location: build-system.armv7lhf-jetson.img
       DISK_SIZE: 3G
       BOOT_DEVICE: /dev/mmcblk0p1
       ROOT_DEVICE: /dev/mmcblk0p2
diff --git a/clusters/sdk-example-cluster.morph b/clusters/sdk-example-cluster.morph.in
index a4413c3b..b1096423 100644
--- a/clusters/sdk-example-cluster.morph
+++ b/clusters/sdk-example-cluster.morph.in
@@ -31,15 +31,15 @@ description: |
 
   See the documentation of the sdk.write extension for more information.
 systems:
-- morph: systems/armv7lhf-cross-toolchain-system-x86_64.morph
+- morph: systems/armv7lhf-cross-toolchain-system.{{CONFIG}}.morph
   deploy:
     sdk:
       type: extensions/sdk
-      location: armv7lhf-cross-toolchain-system-x86_64.sh
+      location: armv7lhf-cross-toolchain-system.sh
       PREFIX: /usr
       TARGET: armv7lhf-baserock-linux-gnueabi
   subsystems:
-  - morph: systems/devel-system-armv7lhf-highbank.morph
+  - morph: systems/devel-system.armv7lhf.morph
     deploy:
       sysroot:
         type: extensions/sysroot
diff --git a/clusters/trove-example.morph b/clusters/trove-example.morph.in
index 81b1c901..fae234de 100644
--- a/clusters/trove-example.morph
+++ b/clusters/trove-example.morph.in
@@ -32,7 +32,7 @@ description: |
   You can find documentation for Trove at the following web address:
   http://wiki.baserock.org/Trove/
 systems:
-- morph: systems/trove-system-x86_64.morph
+- morph: systems/trove-system.{{CONFIG}}.morph
   deploy-defaults:
     HOSTNAME: test-trove
     VCPUS: 2
diff --git a/clusters/upgrade-devel.morph b/clusters/upgrade-devel.morph.in
index dcf1cd8d..63648f29 100644
--- a/clusters/upgrade-devel.morph
+++ b/clusters/upgrade-devel.morph.in
@@ -32,7 +32,7 @@ description: |
   On a base system, use 'diff -r' instead of 'git diff --no-index'. It will
   not be as colourful.
 systems:
-- morph: systems/devel-system-x86_64-generic.morph
+- morph: systems/devel-system.{{ CONFIG }}morph
   deploy:
     self:
       upgrade-type: extensions/ssh-rsync
diff --git a/clusters/weston-qt5-system-x86_64-deploy.morph b/clusters/weston-qt5-system-deploy.morph.in
index 64700314..539d590f 100644
--- a/clusters/weston-qt5-system-x86_64-deploy.morph
+++ b/clusters/weston-qt5-system-deploy.morph.in
@@ -1,22 +1,22 @@
-name: weston-qt5-system-x86_64
+name: weston-qt5-system-deploy
 kind: cluster
 description: |
-  Deploy a stock weston system.
+  Deploy a stock Weston system with Qt5.
 
   The resulting image can be copied to a USB and booted from there,
   as well as in a virtual machine.
 
 systems:
-- morph: systems/weston-qt5-system-x86_64.morph
+- morph: systems/weston-qt5-system.{{CONFIG}}.morph
   deploy:
     weston-qt5-system-x86_64:
       type: extensions/rawdisk
-      location: /weston-qt5-system-x86_64.img
+      location: /weston-qt5-system.img
       DISK_SIZE: 4G
       KERNEL_ARGS: vga=788
       INITRAMFS_PATH: boot/initramfs.gz
   subsystems:
-  - morph: systems/initramfs-x86_64.morph
+  - morph: systems/initramfs.{{CONFIG}}.morph
     deploy:
       initramfs:
         type: initramfs
diff --git a/clusters/weston-system-x86_64-generic-deploy.morph b/clusters/weston-system-deploy.morph.in
index 65e35bd7..09f35a6d 100644
--- a/clusters/weston-system-x86_64-generic-deploy.morph
+++ b/clusters/weston-system-deploy.morph.in
@@ -1,4 +1,4 @@
-name: weston-system-x86_64-generic-deploy
+name: weston-system-deploy
 kind: cluster
 description: |
   Deploy a stock weston system.
@@ -7,16 +7,16 @@ description: |
   as well as in a virtual machine.
 
 systems:
-- morph: systems/weston-system-x86_64-generic.morph
+- morph: systems/weston-system.{{CONFIG}}.morph
   deploy:
-    weston-system-x86_64-generic:
+    weston-system:
       type: extensions/rawdisk
-      location: /weston-system-x86_64-generic.img
+      location: /weston-system.img
       DISK_SIZE: 4G
       KERNEL_ARGS: vga=788
       INITRAMFS_PATH: boot/initramfs.gz
   subsystems:
-  - morph: systems/initramfs-x86_64.morph
+  - morph: systems/initramfs.{{CONFIG}}.morph
     deploy:
       initramfs:
         type: extensions/initramfs
diff --git a/clusters/xfce-system-x86_64-deploy.morph b/clusters/xfce-system-deploy.morph.in
index e8bfe1e9..839892b6 100644
--- a/clusters/xfce-system-x86_64-deploy.morph
+++ b/clusters/xfce-system-deploy.morph.in
@@ -1,4 +1,4 @@
-name: xfce-system-x86_64-deploy
+name: xfce-system-deploy
 kind: cluster
 description: |
   Deploy a stock XFCE system.
@@ -7,16 +7,16 @@ description: |
   as well as in a virtual machine.
 
 systems:
-- morph: systems/xfce-system-x86_64.morph
+- morph: systems/xfce-system.{{ ARCH }}.morph
   deploy:
-    xfce-system-x86_64:
+    xfce-system:
       type: extensions/rawdisk
-      location: /xfce-system-x86_64.img
+      location: /xfce-system.img
       DISK_SIZE: 6G
       KERNEL_ARGS: vga=788
       INITRAMFS_PATH: boot/initramfs.gz
   subsystems:
-  - morph: systems/initramfs-x86_64.morph
+  - morph: systems/initramfs.{{ ARCH }}.morph
     deploy:
       initramfs:
         type: extensions/initramfs
diff --git a/clusters/zookeeper.morph b/clusters/zookeeper.morph.in
index 80197726..778c7d92 100644
--- a/clusters/zookeeper.morph
+++ b/clusters/zookeeper.morph.in
@@ -1,7 +1,7 @@
 name: zookeeper
 kind: cluster
 systems:
-- morph: systems/zookeeper-client-x86_64.morph
+- morph: systems/zookeeper-client.{{CONFIG}}.morph
   deploy:
     my-client-system:
       type: extensions/kvm
@@ -10,7 +10,7 @@ systems:
       RAM_SIZE: 1G
       VCPUS: 1
       HOSTNAME: zkclient
-- morph: systems/zookeeper-server-x86_64.morph
+- morph: systems/zookeeper-server.{{CONFIG}}.morph
   deploy:
     my-server-system:
       type: extensions/kvm