summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-08-26 09:23:40 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-08-26 09:30:13 (GMT)
commitbc1caef721cbdd95037e330fd4fa1236cac135bd (patch)
tree160d6cc1d359182f095e7689ed7a0b443bac4f67
parent626f31eb2850bf8191952ecf2f0fe1f53f8919e1 (diff)
downloaddefinitions-bc1caef721cbdd95037e330fd4fa1236cac135bd.tar.gz
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
-rw-r--r--clusters/example-ceph-cluster-on-openstack.morph84
-rw-r--r--strata/docutils/docbook-xml.morph178
2 files changed, 130 insertions, 132 deletions
diff --git a/clusters/example-ceph-cluster-on-openstack.morph b/clusters/example-ceph-cluster-on-openstack.morph
index 717b5b3..6ddabc9 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://<BASEROCK_OPENSTACK_SERVER_IP>: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_MON_IP>
- CEPH_CLUSTER_FSID: <CEPH_CLUSTER_FSID>
-
- OPENSTACK_IMAGENAME: mon-0-nd
- DISK_SIZE: 10G
+ <<: &common-config
+ type: openstack
+ location: http://<BASEROCK_OPENSTACK_SERVER_IP>: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_MON_IP>
+ CEPH_CLUSTER_FSID: <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
diff --git a/strata/docutils/docbook-xml.morph b/strata/docutils/docbook-xml.morph
index f18acab..91233b6 100644
--- a/strata/docutils/docbook-xml.morph
+++ b/strata/docutils/docbook-xml.morph
@@ -5,100 +5,100 @@ install-commands:
- install -v -d -m755 "$DESTDIR$PREFIX/share/xml/docbook/xml-dtd-4.5"
- install -v -d -m755 "$DESTDIR/etc/xml"
- |
- cp -v -af docbook.cat *.dtd ent/ *.mod \
- "$DESTDIR$PREFIX/share/xml/docbook/xml-dtd-4.5"
+ cp -v -af docbook.cat *.dtd ent/ *.mod \
+ "$DESTDIR$PREFIX/share/xml/docbook/xml-dtd-4.5"
post-install-commands:
- |
- # Create (or update) and populate the "$DESTDIR/etc/xml/docbook" catalog file
- if [ ! -e /etc/xml/docbook ]; then
- xmlcatalog --noout --create "$DESTDIR/etc/xml/docbook"
- else
- # Copy the existing catalog so we can update it
- cp /etc/xml/docbook "$DESTDIR/etc/xml/docbook"
- fi
+ # Create (or update) and populate the "$DESTDIR/etc/xml/docbook" catalog file
+ if [ ! -e /etc/xml/docbook ]; then
+ xmlcatalog --noout --create "$DESTDIR/etc/xml/docbook"
+ else
+ # Copy the existing catalog so we can update it
+ cp /etc/xml/docbook "$DESTDIR/etc/xml/docbook"
+ fi
- |
- xmlcatalog --noout --add "public" \
- "-//OASIS//DTD DocBook XML V4.5//EN" \
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
- "$DESTDIR/etc/xml/docbook"
-- |
- xmlcatalog --noout --add "public" \
- "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
- "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
- "$DESTDIR/etc/xml/docbook"
-- |
- xmlcatalog --noout --add "public" \
- "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
- "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
- "$DESTDIR/etc/xml/docbook"
-- |
- xmlcatalog --noout --add "public" \
- "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
- "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
- "$DESTDIR/etc/xml/docbook"
-- |
- xmlcatalog --noout --add "public" \
- "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
- "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
- "$DESTDIR/etc/xml/docbook"
-- |
- xmlcatalog --noout --add "public" \
- "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
- "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
- "$DESTDIR/etc/xml/docbook"
-- |
- xmlcatalog --noout --add "public" \
- "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
- "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
- "$DESTDIR/etc/xml/docbook"
-- |
- xmlcatalog --noout --add "public" \
- "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
- "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
- "$DESTDIR/etc/xml/docbook"
-- |
- xmlcatalog --noout --add "public" \
- "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
- "$DESTDIR/etc/xml/docbook"
-- |
- xmlcatalog --noout --add "rewriteSystem" \
- "http://www.oasis-open.org/docbook/xml/4.5" \
- "file:///usr/share/xml/docbook/xml-dtd-4.5" \
- "$DESTDIR/etc/xml/docbook"
-- |
- xmlcatalog --noout --add "rewriteURI" \
- "http://www.oasis-open.org/docbook/xml/4.5" \
- "file:///usr/share/xml/docbook/xml-dtd-4.5" \
- "$DESTDIR/etc/xml/docbook"
+ xmlcatalog --noout --add "public" \
+ "-//OASIS//DTD DocBook XML V4.5//EN" \
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
+ "$DESTDIR/etc/xml/docbook"
+- |
+ xmlcatalog --noout --add "public" \
+ "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
+ "$DESTDIR/etc/xml/docbook"
+- |
+ xmlcatalog --noout --add "public" \
+ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
+ "$DESTDIR/etc/xml/docbook"
+- |
+ xmlcatalog --noout --add "public" \
+ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
+ "$DESTDIR/etc/xml/docbook"
+- |
+ xmlcatalog --noout --add "public" \
+ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
+ "$DESTDIR/etc/xml/docbook"
+- |
+ xmlcatalog --noout --add "public" \
+ "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
+ "$DESTDIR/etc/xml/docbook"
+- |
+ xmlcatalog --noout --add "public" \
+ "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
+ "$DESTDIR/etc/xml/docbook"
+- |
+ xmlcatalog --noout --add "public" \
+ "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
+ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
+ "$DESTDIR/etc/xml/docbook"
+- |
+ xmlcatalog --noout --add "public" \
+ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
+ "$DESTDIR/etc/xml/docbook"
+- |
+ xmlcatalog --noout --add "rewriteSystem" \
+ "http://www.oasis-open.org/docbook/xml/4.5" \
+ "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+ "$DESTDIR/etc/xml/docbook"
+- |
+ xmlcatalog --noout --add "rewriteURI" \
+ "http://www.oasis-open.org/docbook/xml/4.5" \
+ "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+ "$DESTDIR/etc/xml/docbook"
- |
- # Create (or update) and populate the "$DESTDIR/etc/xml/catalog" catalog file
- if [ ! -e /etc/xml/catalog ]; then
- echo 'Creating new xml catalog'
- xmlcatalog --noout --create "$DESTDIR/etc/xml/catalog"
- else
- # Copy the existing catalog so we can update it
- cp /etc/xml/catalog "$DESTDIR/etc/xml/catalog"
- fi
+ # Create (or update) and populate the "$DESTDIR/etc/xml/catalog" catalog file
+ if [ ! -e /etc/xml/catalog ]; then
+ echo 'Creating new xml catalog'
+ xmlcatalog --noout --create "$DESTDIR/etc/xml/catalog"
+ else
+ # Copy the existing catalog so we can update it
+ cp /etc/xml/catalog "$DESTDIR/etc/xml/catalog"
+ fi
- |
- xmlcatalog --noout --add "delegatePublic" \
- "-//OASIS//ENTITIES DocBook XML" \
- "file:///etc/xml/docbook" \
- "$DESTDIR/etc/xml/catalog"
-- |
- xmlcatalog --noout --add "delegatePublic" \
- "-//OASIS//DTD DocBook XML" \
- "file:///etc/xml/docbook" \
- "$DESTDIR/etc/xml/catalog"
-- |
- xmlcatalog --noout --add "delegateSystem" \
- "http://www.oasis-open.org/docbook/" \
- "file:///etc/xml/docbook" \
- "$DESTDIR/etc/xml/catalog"
-- |
- xmlcatalog --noout --add "delegateURI" \
- "http://www.oasis-open.org/docbook/" \
- "file:///etc/xml/docbook" \
- "$DESTDIR/etc/xml/catalog"
+ xmlcatalog --noout --add "delegatePublic" \
+ "-//OASIS//ENTITIES DocBook XML" \
+ "file:///etc/xml/docbook" \
+ "$DESTDIR/etc/xml/catalog"
+- |
+ xmlcatalog --noout --add "delegatePublic" \
+ "-//OASIS//DTD DocBook XML" \
+ "file:///etc/xml/docbook" \
+ "$DESTDIR/etc/xml/catalog"
+- |
+ xmlcatalog --noout --add "delegateSystem" \
+ "http://www.oasis-open.org/docbook/" \
+ "file:///etc/xml/docbook" \
+ "$DESTDIR/etc/xml/catalog"
+- |
+ xmlcatalog --noout --add "delegateURI" \
+ "http://www.oasis-open.org/docbook/" \
+ "file:///etc/xml/docbook" \
+ "$DESTDIR/etc/xml/catalog"