summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-11-02 17:46:37 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-11-02 17:46:37 +0000
commitac4b2224ae5c7de0a273cb3c42dc64ae0d0fbd2b (patch)
tree90b8dc9a6c803286918420e0d968899aa7bef3e5
parent398a7fa93a05b44adba1d7557b1ad4a24f466369 (diff)
downloadinfrastructure-ac4b2224ae5c7de0a273cb3c42dc64ae0d0fbd2b.tar.gz
Run definition migrations 002 - 005
-rw-r--r--baserock_gerrit/baserock_gerrit.morph18
-rw-r--r--baserock_irclogs/clusters/irclogs.morph2
-rw-r--r--baserock_mason_x86_32/mason-x86-32.morph2
-rw-r--r--baserock_mason_x86_64/mason-x86-64.morph2
4 files changed, 12 insertions, 12 deletions
diff --git a/baserock_gerrit/baserock_gerrit.morph b/baserock_gerrit/baserock_gerrit.morph
index 76a92667..30cd01c4 100644
--- a/baserock_gerrit/baserock_gerrit.morph
+++ b/baserock_gerrit/baserock_gerrit.morph
@@ -9,18 +9,18 @@ description: |
is up and running. See the README for instructions.
systems:
- - morph: systems/gerrit-system-x86_64.morph
- deploy:
- gerrit.baserock.org:
- type: openstack
- location: https://compute.datacentred.io:5000/v2.0
+- morph: systems/gerrit-system-x86_64.morph
+ deploy:
+ gerrit.baserock.org:
+ type: 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
- OPENSTACK_IMAGENAME: baserock_gerrit
- CLOUD_INIT: yes
- DISK_SIZE: 3G
- KERNEL_ARGS: console=tty0 console=ttyS0
+ OPENSTACK_IMAGENAME: baserock_gerrit
+ CLOUD_INIT: true
+ DISK_SIZE: 3G
+ KERNEL_ARGS: console=tty0 console=ttyS0
diff --git a/baserock_irclogs/clusters/irclogs.morph b/baserock_irclogs/clusters/irclogs.morph
index 8c899d03..cc26b4db 100644
--- a/baserock_irclogs/clusters/irclogs.morph
+++ b/baserock_irclogs/clusters/irclogs.morph
@@ -8,6 +8,6 @@ systems:
location: http://compute.datacentred.io:5000/v2.0/
DISK_SIZE: 4G
HOSTNAME: irclogs
- CLOUD_INIT: yes
+ CLOUD_INIT: true
KERNEL_ARGS: console=ttyS0 console=tty0
OPENSTACK_IMAGENAME: irclogs
diff --git a/baserock_mason_x86_32/mason-x86-32.morph b/baserock_mason_x86_32/mason-x86-32.morph
index 6fe53fcb..c05381b5 100644
--- a/baserock_mason_x86_32/mason-x86-32.morph
+++ b/baserock_mason_x86_32/mason-x86-32.morph
@@ -8,7 +8,7 @@ systems:
mason:
type: openstack
location: https://compute.datacentred.io:5000/v2.0
- CLOUD_INIT: yes
+ CLOUD_INIT: true
DISK_SIZE: 3G
DISTBUILD_GENERIC: true
INSTALL_FILES: distbuild/manifest
diff --git a/baserock_mason_x86_64/mason-x86-64.morph b/baserock_mason_x86_64/mason-x86-64.morph
index ae17716f..cbf26abc 100644
--- a/baserock_mason_x86_64/mason-x86-64.morph
+++ b/baserock_mason_x86_64/mason-x86-64.morph
@@ -8,7 +8,7 @@ systems:
mason:
type: openstack
location: https://compute.datacentred.io:5000/v2.0
- CLOUD_INIT: yes
+ CLOUD_INIT: true
DISK_SIZE: 3G
DISTBUILD_GENERIC: true
INSTALL_FILES: distbuild/manifest