From bc1caef721cbdd95037e330fd4fa1236cac135bd Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 26 Aug 2015 10:23:40 +0100 Subject: Use 2 spaces for indent in all .morph files This was generated with the migrations/indent script. Having consistent indent is nice, and also reduces churn when running migrations scripts. There should be no functional changes here. Change-Id: I75616f2750d4ac80279c30d463571871e0fac02b --- clusters/example-ceph-cluster-on-openstack.morph | 84 ++++++++++++------------ 1 file changed, 41 insertions(+), 43 deletions(-) (limited to 'clusters/example-ceph-cluster-on-openstack.morph') diff --git a/clusters/example-ceph-cluster-on-openstack.morph b/clusters/example-ceph-cluster-on-openstack.morph index 717b5b31..6ddabc90 100644 --- a/clusters/example-ceph-cluster-on-openstack.morph +++ b/clusters/example-ceph-cluster-on-openstack.morph @@ -1,57 +1,55 @@ -name: example-ceph-cluster-on-openstack +name: example-ceph-cluster-on-openstack kind: cluster description: | - This cluster morphology will deploy a 3 node ceph storage cluster to an - openstack server. + This cluster morphology will deploy a 3 node ceph storage cluster to an + openstack server. - It was written for use with the following guide on the baserock wiki: - http://wiki.baserock.org/guides/ceph-cluster-deploy/ + It was written for use with the following guide on the baserock wiki: + http://wiki.baserock.org/guides/ceph-cluster-deploy/ - See this guide for more information. + See this guide for more information. - See the ceph.configure file for more informatiion on the ceph - specific fields used in this cluster morphology. + See the ceph.configure file for more informatiion on the ceph + specific fields used in this cluster morphology. systems: - morph: systems/ceph-service-x86_64-generic.morph deploy: - ceph-mon-0-openstack: + ceph-mon-0-openstack: # openstack info - <<: &common-config - type: openstack - location: http://:5000/v2.0/ - OPENSTACK_USER: demo - OPENSTACK_PASSWORD: demo - OPENSTACK_TENANT: demo - CLOUD_INIT: yes - KERNEL_ARGS: console=ttyS0 console=tty0 - CEPH_CLUSTER: ceph - CEPH_CONF: ceph.conf - CEPH_CLIENT_ADMIN: ceph.client.admin.keyring - CEPH_MON_IP: - CEPH_CLUSTER_FSID: - - OPENSTACK_IMAGENAME: mon-0-nd - DISK_SIZE: 10G + <<: &common-config + type: openstack + location: http://:5000/v2.0/ + OPENSTACK_USER: demo + OPENSTACK_PASSWORD: demo + OPENSTACK_TENANT: demo + CLOUD_INIT: true + KERNEL_ARGS: console=ttyS0 console=tty0 + CEPH_CLUSTER: ceph + CEPH_CONF: ceph.conf + CEPH_CLIENT_ADMIN: ceph.client.admin.keyring + CEPH_MON_IP: + CEPH_CLUSTER_FSID: + + OPENSTACK_IMAGENAME: mon-0-nd + DISK_SIZE: 10G # Ceph info - HOSTNAME: mon-0 - CEPH_MON: - ceph-osd-0-openstack: - <<: *common-config - - OPENSTACK_IMAGENAME: osd-0 - DISK_SIZE: 7G + HOSTNAME: mon-0 + CEPH_MON: + ceph-osd-0-openstack: + <<: *common-config + OPENSTACK_IMAGENAME: osd-0 + DISK_SIZE: 7G # ceph info - HOSTNAME: osd-0 - CEPH_OSD: - CEPH_OSD_STORAGE_DEV: /dev/vdb - ceph-osd-1-openstack: - <<: *common-config - - OPENSTACK_IMAGENAME: osd-1 - DISK_SIZE: 7G + HOSTNAME: osd-0 + CEPH_OSD: + CEPH_OSD_STORAGE_DEV: /dev/vdb + ceph-osd-1-openstack: + <<: *common-config + OPENSTACK_IMAGENAME: osd-1 + DISK_SIZE: 7G # ceph info - HOSTNAME: osd-1 + HOSTNAME: osd-1 - CEPH_OSD: - CEPH_OSD_STORAGE_DEV: /dev/vdb + CEPH_OSD: + CEPH_OSD_STORAGE_DEV: /dev/vdb -- cgit v1.2.1