diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2016-02-19 17:03:21 +0000 |
|---|---|---|
| committer | Baserock Gerrit <gerrit@baserock.org> | 2016-02-20 13:05:21 +0000 |
| commit | 82b53661fd8c141e63ed338dca3d35285abab038 (patch) | |
| tree | 3b17191eb71aab91878dac02cbd810f6287e32e6 | |
| parent | 3b6cdf2b50f190a24ad0afb677262fd244112e3d (diff) | |
| download | infrastructure-82b53661fd8c141e63ed338dca3d35285abab038.tar.gz | |
Update infra machines built with Baserock
Change-Id: Iabfb66336fc69dc71432ada2b5a84679512abaf8
| -rw-r--r-- | baserock_gerrit/baserock_gerrit.morph | 8 | ||||
| -rw-r--r-- | baserock_irclogs/clusters/irclogs.morph | 6 | ||||
| -rw-r--r-- | baserock_irclogs/systems/irclogs-x86_64.morph | 14 | ||||
| -rw-r--r-- | baserock_mason_x86_64/mason-x86-64.morph | 8 |
4 files changed, 22 insertions, 14 deletions
diff --git a/baserock_gerrit/baserock_gerrit.morph b/baserock_gerrit/baserock_gerrit.morph index 4157266b..c9b3b736 100644 --- a/baserock_gerrit/baserock_gerrit.morph +++ b/baserock_gerrit/baserock_gerrit.morph @@ -15,10 +15,10 @@ systems: type: extensions/openstack location: https://compute.datacentred.io:5000/v2.0 - # You can use this method to deploy upgrades over SSH, after the - # machine is deployed. - #type: ssh-rsync - #location: root@gerrit.baserock.org + # You can use this method to deploy upgrades over SSH, after the + # machine is deployed. + upgrade-type: extensions/ssh-rsync + upgrade-location: root@192.168.222.69 OPENSTACK_IMAGENAME: baserock_gerrit CLOUD_INIT: true diff --git a/baserock_irclogs/clusters/irclogs.morph b/baserock_irclogs/clusters/irclogs.morph index cc26b4db..60a0bd07 100644 --- a/baserock_irclogs/clusters/irclogs.morph +++ b/baserock_irclogs/clusters/irclogs.morph @@ -4,8 +4,12 @@ systems: - morph: baserock_irclogs/systems/irclogs-x86_64.morph deploy: irclogs: - type: openstack + type: extensions/openstack location: http://compute.datacentred.io:5000/v2.0/ + + upgrade-type: extensions/ssh-rsync + upgrade-location: root@192.168.222.74 + DISK_SIZE: 4G HOSTNAME: irclogs CLOUD_INIT: true diff --git a/baserock_irclogs/systems/irclogs-x86_64.morph b/baserock_irclogs/systems/irclogs-x86_64.morph index 50b62e4f..03eb7409 100644 --- a/baserock_irclogs/systems/irclogs-x86_64.morph +++ b/baserock_irclogs/systems/irclogs-x86_64.morph @@ -1,7 +1,7 @@ name: irclogs-system-x86_64 kind: system -description: The set of strata required to have a minimal system for a 64-bit x86 - system. +description: | + The IRC logging system that runs at <http://irclogs.baserock.org>. arch: x86_64 strata: - name: build-essential @@ -25,9 +25,9 @@ strata: - name: cloudinit-support morph: strata/cloudinit-support.morph configuration-extensions: -- set-hostname -- add-config-files -- nfsboot -- install-files -- cloud-init +- extensions/set-hostname +- extensions/add-config-files +- extensions/nfsboot +- extensions/install-files +- extensions/cloud-init - baserock_irclogs/irclogs diff --git a/baserock_mason_x86_64/mason-x86-64.morph b/baserock_mason_x86_64/mason-x86-64.morph index cbf26abc..d0377a00 100644 --- a/baserock_mason_x86_64/mason-x86-64.morph +++ b/baserock_mason_x86_64/mason-x86-64.morph @@ -6,12 +6,16 @@ systems: - morph: systems/build-system-x86_64.morph deploy: mason: - type: openstack + type: extensions/openstack location: https://compute.datacentred.io:5000/v2.0 + + upgrade-type: extensions/ssh-rsync + upgrade-location: root@192.168.222.80 + CLOUD_INIT: true DISK_SIZE: 3G DISTBUILD_GENERIC: true - INSTALL_FILES: distbuild/manifest + INSTALL_FILES: install-files/distbuild/manifest KERNEL_ARGS: console=ttyS0 console=tty0 MASON_GENERIC: true OPENSTACK_IMAGENAME: baserock_mason_x86_64 |