summaryrefslogtreecommitdiff
path: root/clusters
diff options
context:
space:
mode:
Diffstat (limited to 'clusters')
-rw-r--r--clusters/ci.def (renamed from clusters/ci.morph)3
-rw-r--r--clusters/example-distbuild-cluster.def (renamed from clusters/example-distbuild-cluster.morph)3
-rw-r--r--clusters/gerrit-openstack.def (renamed from clusters/gerrit-openstack.morph)3
-rw-r--r--clusters/gitlab-ci-runner-cluster.def (renamed from clusters/gitlab-ci-runner-cluster.morph)3
-rw-r--r--clusters/gitlab-cluster.def (renamed from clusters/gitlab-cluster.morph)5
-rw-r--r--clusters/gitlab-server-cluster.def (renamed from clusters/gitlab-server-cluster.morph)3
-rw-r--r--clusters/image-package-example.def (renamed from clusters/image-package-example.morph)3
-rw-r--r--clusters/initramfs-test.def (renamed from clusters/initramfs-test.morph)4
-rw-r--r--clusters/jetson-upgrade.def (renamed from clusters/jetson-upgrade.morph)3
-rw-r--r--clusters/mason-openstack.def (renamed from clusters/mason-openstack.morph)5
-rw-r--r--clusters/mason.def (renamed from clusters/mason.morph)7
-rw-r--r--clusters/minimal-system-deploy.def (renamed from clusters/minimal-system-deploy.morph)3
-rw-r--r--clusters/release.def (renamed from clusters/release.morph)15
-rw-r--r--clusters/sdk-example-cluster.def (renamed from clusters/sdk-example-cluster.morph)4
-rw-r--r--clusters/trove-example.def (renamed from clusters/trove-example.morph)7
-rw-r--r--clusters/trove.baserock.org-upgrade.def (renamed from clusters/trove.baserock.org-upgrade.morph)3
-rw-r--r--clusters/upgrade-devel.def (renamed from clusters/upgrade-devel.morph)5
17 files changed, 30 insertions, 49 deletions
diff --git a/clusters/ci.morph b/clusters/ci.def
index f860a4ba..a2d8d599 100644
--- a/clusters/ci.morph
+++ b/clusters/ci.def
@@ -1,12 +1,11 @@
name: ci
-kind: cluster
description: |
Deploy all the systems for CD.
This cluster morph is for use by the Mason Continuous Delivery pipeline
during development.
systems:
-- morph: systems/devel-system-x86_64-generic.morph
+- name: devel-system-x86_64-generic
deploy:
devel-system-x86_64-generic:
type: rawdisk
diff --git a/clusters/example-distbuild-cluster.morph b/clusters/example-distbuild-cluster.def
index 513c16c5..d999e683 100644
--- a/clusters/example-distbuild-cluster.morph
+++ b/clusters/example-distbuild-cluster.def
@@ -1,5 +1,4 @@
name: example-distbuild-cluster
-kind: cluster
description: |
This is an example cluster morph that can be adapted to set up a
Baserock distributed build network.
@@ -10,7 +9,7 @@ description: |
workers to authenticate with the Trove to give them read access to
all source repositories.
systems:
-- morph: systems/build-system-x86_64.morph
+- name: build-system-x86_64
deploy-defaults:
CONTROLLERHOST: build-controller
DISTBUILD_CONTROLLER: false
diff --git a/clusters/gerrit-openstack.morph b/clusters/gerrit-openstack.def
index bdfb128c..ebddf213 100644
--- a/clusters/gerrit-openstack.morph
+++ b/clusters/gerrit-openstack.def
@@ -1,9 +1,8 @@
name: open-stack-gerrit
-kind: cluster
description: |
Deploy gerrit morphology into openstack
systems:
-- morph: systems/gerrit-x86_64.morph
+- name: gerrit-x86_64
deploy:
openstack-image:
type: openstack
diff --git a/clusters/gitlab-ci-runner-cluster.morph b/clusters/gitlab-ci-runner-cluster.def
index 97da4a8d..a0d1cae4 100644
--- a/clusters/gitlab-ci-runner-cluster.morph
+++ b/clusters/gitlab-ci-runner-cluster.def
@@ -1,7 +1,6 @@
name: gitlab-ci-runner-cluster
-kind: cluster
systems:
-- morph: systems/gitlab-ci-runner.morph
+- name: gitlab-ci-runner
deploy-defaults:
AUTOSTART: false
DISK_SIZE: 6G
diff --git a/clusters/gitlab-cluster.morph b/clusters/gitlab-cluster.def
index 5f3177ca..5675c440 100644
--- a/clusters/gitlab-cluster.morph
+++ b/clusters/gitlab-cluster.def
@@ -1,5 +1,4 @@
name: gitlab-cluster
-kind: cluster
description: |
This is an example cluster morphology that can be adapted to set up a GitLab
server with GitLab CI running alongside it, along with one or more CI
@@ -14,7 +13,7 @@ description: |
need to define a GITLAB_EMAIL, that is the email that mail from your GitLab
instance will appear to be from.
systems:
-- morph: systems/gitlab-server.morph
+- name: gitlab-server
deploy-defaults:
AUTOSTART: false
DISK_SIZE: 10G
@@ -33,7 +32,7 @@ systems:
INSTALL_FILES: gitlab-server/manifest
UNICORN_CI_PORT: 8081
UNICORN_PORT: 8080
-- morph: systems/gitlab-ci-runner.morph
+- name: gitlab-ci-runner
deploy-defaults:
AUTOSTART: false
DISK_SIZE: 10G
diff --git a/clusters/gitlab-server-cluster.morph b/clusters/gitlab-server-cluster.def
index fcb7c1d2..089e7fae 100644
--- a/clusters/gitlab-server-cluster.morph
+++ b/clusters/gitlab-server-cluster.def
@@ -1,7 +1,6 @@
name: gitlab-server-cluster
-kind: cluster
systems:
-- morph: systems/gitlab-server.morph
+- name: gitlab-server
deploy-defaults:
AUTOSTART: false
DISK_SIZE: 6G
diff --git a/clusters/image-package-example.morph b/clusters/image-package-example.def
index fd8487e2..fd056bbb 100644
--- a/clusters/image-package-example.morph
+++ b/clusters/image-package-example.def
@@ -1,9 +1,8 @@
name: image-package-example
-kind: cluster
description: |
Packaged system and script for installing it, for deferred instantiation.
systems:
-- morph: systems/base-system-x86_32-generic.morph
+- name: base-system-x86_32-generic
deploy:
imgpkg:
type: image-package
diff --git a/clusters/initramfs-test.morph b/clusters/initramfs-test.def
index afc94961..81265f13 100644
--- a/clusters/initramfs-test.morph
+++ b/clusters/initramfs-test.def
@@ -1,7 +1,6 @@
name: initramfs-test
-kind: cluster
systems:
-- morph: systems/base-system-x86_64-generic.morph
+- name: base-system-x86_64-generic
deploy:
system:
type: rawdisk
@@ -10,7 +9,6 @@ systems:
HOSTNAME: initramfs-system
INITRAMFS_PATH: boot/initramfs.gz
subsystems:
- - morph: systems/initramfs-x86_64.morph
deploy:
initramfs:
type: initramfs
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.def
index a73507aa..16c6d791 100644
--- a/clusters/jetson-upgrade.morph
+++ b/clusters/jetson-upgrade.def
@@ -1,7 +1,6 @@
name: jetson-upgrade
-kind: cluster
systems:
-- morph: systems/devel-system-armv7lhf-jetson.morph
+- name: devel-system-armv7lhf-jetson
deploy-defaults:
TROVE_HOST: TROVE_HOST
TROVE_ID: TROVE_ID
diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.def
index bea73dda..90fe10a0 100644
--- a/clusters/mason-openstack.morph
+++ b/clusters/mason-openstack.def
@@ -1,10 +1,9 @@
name: openstack-mason
-kind: cluster
description: |
This is a template cluster morphology that can be adapted to set up a
Mason. Masons are composed of a trove and a distbuild system.
systems:
-- morph: systems/distbuild-system-x86_64-openstack.morph
+- name: distbuild-system-x86_64-openstack
deploy-defaults:
ARTIFACT_CACHE_SERVER: example-cache-server
CONTROLLERHOST: controller-hostname
@@ -23,7 +22,7 @@ systems:
DISK_SIZE: 6G
DISTBUILD_CONTROLLER: true
HOSTNAME: controller-hostname
- MASON_CLUSTER_MORPHOLOGY: clusters/ci.morph
+ MASON_CLUSTER_MORPHOLOGY: clusters/ci
MASON_DEFINITIONS_REF: master
MASON_DISTBUILD_ARCH: x86_64
MASON_TEST_HOST: user@openstack-auth-url
diff --git a/clusters/mason.morph b/clusters/mason.def
index 9717239d..34b0f6b0 100644
--- a/clusters/mason.morph
+++ b/clusters/mason.def
@@ -1,5 +1,4 @@
name: example-mason-cluster
-kind: cluster
description: |
This is a template cluster morphology that can be adapted to set up a
Mason. Masons are composed of a trove and a distbuild system.
@@ -8,7 +7,7 @@ description: |
template to suit your needs. It also handles the generation of
keys to let the systems communicate.
systems:
-- morph: systems/trove-system-x86_64.morph
+- name: trove-system-x86_64
deploy:
red-box-v1-trove:
type: kvm
@@ -30,7 +29,7 @@ systems:
VCPUS: 2
VERSION_LABEL: 45
WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub
-- morph: systems/build-system-x86_64.morph
+- name: build-system-x86_64
deploy-defaults:
ARTIFACT_CACHE_SERVER: red-box-v1-trove.example.com
CONTROLLERHOST: red-box-v1-controller.example.com
@@ -49,7 +48,7 @@ systems:
DISK_SIZE: 60G
DISTBUILD_CONTROLLER: true
HOSTNAME: red-box-v1-controller
- MASON_CLUSTER_MORPHOLOGY: clusters/ci.morph
+ MASON_CLUSTER_MORPHOLOGY: clusters/ci
MASON_DEFINITIONS_REF: master
MASON_DISTBUILD_ARCH: x86_64
MASON_TEST_HOST: vm-user@vm-host:/vm-path/
diff --git a/clusters/minimal-system-deploy.morph b/clusters/minimal-system-deploy.def
index 06629ffc..da5261f2 100644
--- a/clusters/minimal-system-deploy.morph
+++ b/clusters/minimal-system-deploy.def
@@ -1,9 +1,8 @@
name: minimal-system-deploy
-kind: cluster
description: |
Deploy a minimal system to a system running KVM
systems:
-- morph: systems/minimal-system-x86_32-generic.morph
+- name: minimal-system-x86_32-generic
deploy:
vm:
type: kvm
diff --git a/clusters/release.morph b/clusters/release.def
index f161d0df..174541ec 100644
--- a/clusters/release.morph
+++ b/clusters/release.def
@@ -1,5 +1,4 @@
name: release
-kind: cluster
description: |
Deploy all the systems for we support in a release.
@@ -7,29 +6,29 @@ 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
+- name: build-system-x86_32-chroot
deploy:
build-system-x86_32-chroot:
type: tar
location: build-system-x86_32-chroot.tar
-- morph: systems/build-system-x86_32.morph
+- name: build-system-x86_32
deploy:
build-system-x86_32:
type: rawdisk
location: build-system-x86_32.img
DISK_SIZE: 6G
-- morph: systems/build-system-x86_64-chroot.morph
+- name: build-system-x86_64-chroot
deploy:
build-system-x86_64-chroot:
type: tar
location: build-system-x86_64-chroot.tar
-- morph: systems/build-system-x86_64.morph
+- name: build-system-x86_64
deploy:
build-system-x86_64:
type: rawdisk
location: build-system-x86_64.img
DISK_SIZE: 6G
-- morph: systems/build-system-armv7lhf-jetson.morph
+- name: build-system-armv7lhf-jetson
deploy:
devel-system-armv7lhf-jetson:
type: rawdisk
@@ -40,14 +39,14 @@ systems:
BOOTLOADER_CONFIG_FORMAT: "extlinux"
BOOTLOADER_INSTALL: "none"
KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
-- morph: systems/genivi-baseline-system-x86_64-generic.morph
+- name: genivi-baseline-system-x86_64-generic
deploy:
genivi-baseline-system-x86_64-generic:
type: rawdisk
location: genivi-baseline-system-x86_64-generic.img
DISK_SIZE: 4G
KERNEL_ARGS: vga=788
-- morph: systems/genivi-baseline-system-armv7lhf-jetson.morph
+- name: genivi-baseline-system-armv7lhf-jetson
deploy:
genivi-baseline-system-armv7lhf-jetson:
type: rawdisk
diff --git a/clusters/sdk-example-cluster.morph b/clusters/sdk-example-cluster.def
index f71d093d..5a2d512e 100644
--- a/clusters/sdk-example-cluster.morph
+++ b/clusters/sdk-example-cluster.def
@@ -1,5 +1,4 @@
name: sdk
-kind: cluster
description: |
An example of creating a cross-compile SDK for an embedded Baserock system.
@@ -31,7 +30,7 @@ description: |
See the documentation of the sdk.write extension for more information.
systems:
-- morph: systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph
+- name: armv7lhf-cross-toolchain-system-x86_32-generic
deploy:
sdk:
type: sdk
@@ -39,7 +38,6 @@ systems:
PREFIX: /usr
TARGET: armv7lhf-baserock-linux-gnueabi
subsystems:
- - morph: systems/devel-system-armv7lhf-highbank.morph
deploy:
sysroot:
type: sysroot
diff --git a/clusters/trove-example.morph b/clusters/trove-example.def
index 25ee579d..5913c152 100644
--- a/clusters/trove-example.morph
+++ b/clusters/trove-example.def
@@ -1,5 +1,4 @@
name: trove-example
-kind: cluster
description: |
This is an example cluster morphology for deploying a Trove,
both the initial deployment and an upgrade.
@@ -16,13 +15,13 @@ description: |
To do the initial deployment:
- morph deploy --upgrade clusters/trove-example.morph \
+ morph deploy --upgrade clusters/trove-example \
initial \
initial.location=kvm+ssh://liw@192.168.122.1/test-trove/tmp/test-trove.img
To do an upgrade:
- morph deploy clusters/trove-example.morph \
+ morph deploy clusters/trove-example \
upgrade upgrade.VERSION_LABEL=123
where `VERSION_LABEL` gets a new unique value each time.
@@ -33,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
+- name: trove-system-x86_64
deploy-defaults:
HOSTNAME: test-trove
VCPUS: 2
diff --git a/clusters/trove.baserock.org-upgrade.morph b/clusters/trove.baserock.org-upgrade.def
index eaf939e1..3b0671be 100644
--- a/clusters/trove.baserock.org-upgrade.morph
+++ b/clusters/trove.baserock.org-upgrade.def
@@ -1,5 +1,4 @@
name: trove.baserock.org-upgrade
-kind: cluster
description: |
This is a cluster morphology for deploying an UPGRADE to
git.baserock.org. It doesn't work for the initial deployment. The
@@ -10,7 +9,7 @@ description: |
Replace the value of gbo.VERSION_LABEL above with the current date.
You can add letters if you need to upgrade multiple times in a day.
systems:
-- morph: systems/trove-system-x86_64.morph
+- name: trove-system-x86_64
deploy:
gbo:
type: ssh-rsync
diff --git a/clusters/upgrade-devel.morph b/clusters/upgrade-devel.def
index b7ce9bc0..b4685ba1 100644
--- a/clusters/upgrade-devel.morph
+++ b/clusters/upgrade-devel.def
@@ -1,5 +1,4 @@
name: upgrade-devel
-kind: cluster
description: |
This is a cluster morphology that can be used to deploy systems to a
an existing Baserock devel system, as an upgrade of the running system.
@@ -18,7 +17,7 @@ description: |
To upgrade, select a sensible a value for VERSION_LABEL and run:
- morph deploy --upgrade upgrade-devel.morph self.HOSTNAME=$(hostname) self.VERSION_LABEL=$VERSION_LABEL
+ morph deploy --upgrade upgrade-devel self.HOSTNAME=$(hostname) self.VERSION_LABEL=$VERSION_LABEL
Your configuration in /etc should be propagated to the new system, but there
may be merge conflicts. Check /etc for files named '.rej' and '.orig' in the
@@ -32,7 +31,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
+- name: devel-system-x86_64-generic
deploy:
self:
type: ssh-rsync
View Lorry Controller Status