From 2b9a378e7024dae98d16ce2de1468f65a095f309 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 16 Jul 2015 11:09:21 +0100 Subject: Reformat all definitions according to a consistent style This was done using the 'indent' tool, which uses a fork of PyYAML named 'ruamel.yaml' to rewrite YAML files without losing comments, ordering, or certain elements of formatting. My aim with doing this is to open the door to automated editing of the reference system definitions using the 'ruamel.yaml' library. This can be used to implement automated migration when we want to make changes to the YAML format that we use to represent Baserock system definitions. Although this looks drastic, remember that it's actually only altered 65 out of 608 .morph files -- the vast majority already pass unchanged through my version of ruamel.yaml. Change-Id: I95ec978714b5bd1c02c90183336a9fbb846cb692 --- clusters/openstack-one-node-swift.morph | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'clusters/openstack-one-node-swift.morph') diff --git a/clusters/openstack-one-node-swift.morph b/clusters/openstack-one-node-swift.morph index de7066d6..fc289538 100644 --- a/clusters/openstack-one-node-swift.morph +++ b/clusters/openstack-one-node-swift.morph @@ -51,7 +51,7 @@ systems: ## Swift config options ######################################################################### - SWIFT_CONTROLLER: True + SWIFT_CONTROLLER: true SWIFT_ADMIN_PASSWORD: insecure @@ -59,13 +59,13 @@ systems: SWIFT_REPLICAS: 3 SWIFT_MIN_PART_HOURS: 1 - SWIFT_STORAGE_DEVICES: [{ ip: , device: sdb, weight: 100 }, - { ip: , device: sdc, weight: 100 }, - { ip: , device: sdd, weight: 100 }, - - { ip: , device: sdb, weight: 100 }, - { ip: , device: sdc, weight: 100 }, - { ip: , device: sdd, weight: 100 }] + SWIFT_STORAGE_DEVICES: + - {ip: , device: sdb, weight: 100} + - {ip: , device: sdc, weight: 100} + - {ip: , device: sdd, weight: 100} + - {ip: , device: sdb, weight: 100} + - {ip: , device: sdc, weight: 100} + - {ip: , device: sdd, weight: 100} # This value can be any random string or number # but each node in your swift cluster must have the same values @@ -91,13 +91,13 @@ systems: CONTROLLER_HOST_ADDRESS: onenode MANAGEMENT_INTERFACE_IP_ADDRESS: - KEYSTONE_ENABLE_SERVICE: True + KEYSTONE_ENABLE_SERVICE: true KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8 KEYSTONE_ADMIN_PASSWORD: veryinsecure KEYSTONE_DB_USER: keystoneDB KEYSTONE_DB_PASSWORD: veryinsecure - GLANCE_ENABLE_SERVICE: True + GLANCE_ENABLE_SERVICE: true GLANCE_SERVICE_USER: glance GLANCE_SERVICE_PASSWORD: veryinsecure GLANCE_DB_USER: glanceDB @@ -108,7 +108,7 @@ systems: NOVA_DB_USER: novaDB NOVA_DB_PASSWORD: veryinsecure NOVA_VIRT_TYPE: qemu - NOVA_BAREMETAL_SCHEDULING: no + NOVA_BAREMETAL_SCHEDULING: false CINDER_SERVICE_USER: cinder CINDER_SERVICE_PASSWORD: veryinsecure @@ -123,7 +123,7 @@ systems: NEUTRON_DB_PASSWORD: veryinsecure METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret - IRONIC_ENABLE_SERVICE: True + IRONIC_ENABLE_SERVICE: true IRONIC_SERVICE_USER: ironic IRONIC_SERVICE_PASSWORD: veryinsecure IRONIC_DB_USER: ironicDB -- cgit v1.2.1