summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-08-14 10:48:21 +0000
committerBaserock Gerrit <gerrit@baserock.org>2015-08-19 03:31:10 +0000
commit0fd38b896863415887fd1b3e38238fece167ee9e (patch)
treed569c64e1e52c1d8cc1e9e238eb7d2dae0a4bdd9
parent816ed7b6e56b0b142e293e4d0bc19733edc04c28 (diff)
downloaddefinitions-0fd38b896863415887fd1b3e38238fece167ee9e.tar.gz
Small fixes to examples of clusters for upgrades
Change-Id: I7d3108e56db2f97327b6c0c5e108953094aaeea6
-rw-r--r--clusters/jetson-upgrade.morph6
-rw-r--r--clusters/upgrade-devel.morph6
2 files changed, 5 insertions, 7 deletions
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph
index c335445b..c8ac0681 100644
--- a/clusters/jetson-upgrade.morph
+++ b/clusters/jetson-upgrade.morph
@@ -3,8 +3,6 @@ kind: cluster
systems:
- morph: systems/devel-system-armv7lhf-jetson.morph
deploy-defaults:
- TROVE_HOST: TROVE_HOST
- TROVE_ID: TROVE_ID
BOOT_DEVICE: /dev/mmcblk0p1
ROOT_DEVICE: /dev/mmcblk0p2
DTB_PATH: boot/tegra124-jetson-tk1.dtb
@@ -15,5 +13,5 @@ systems:
FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2
deploy:
self:
- type: extensions/ssh-rsync
- location: root@127.0.0.1
+ upgrade-type: extensions/ssh-rsync
+ upgrade-location: root@127.0.0.1
diff --git a/clusters/upgrade-devel.morph b/clusters/upgrade-devel.morph
index 3efbb36a..dcf1cd8d 100644
--- a/clusters/upgrade-devel.morph
+++ b/clusters/upgrade-devel.morph
@@ -18,7 +18,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 upgrade clusters/upgrade-devel.morph 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
@@ -35,5 +35,5 @@ systems:
- morph: systems/devel-system-x86_64-generic.morph
deploy:
self:
- type: extensions/ssh-rsync
- location: root@127.0.0.1
+ upgrade-type: extensions/ssh-rsync
+ upgrade-location: root@127.0.0.1