From c2f2be4d5ec8605eb9ad9c7bde28495f855eb38e Mon Sep 17 00:00:00 2001
From: Serguei Bezverkhi <sbezverk@cisco.com>
Date: Thu, 17 Mar 2016 11:43:15 -0400
Subject: [PATCH] Changing Swift option section in globals.yml
This patch adds some explanations for different options available
in /etc/kolla/globals.yml for customizing swift configuration.
Trivial fix
Change-Id: Iaf03f5293804d63c87d8881ac4282909a81b0bfe
---
etc/kolla/globals.yml | 40 ++++++++++++++++++++++++++++++----------
1 file changed, 30 insertions(+), 10 deletions(-)
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 9de1874f27..8aa0da4c32 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -40,11 +40,11 @@ kolla_internal_vip_address: "10.10.10.254"
# Docker options
####################
### Example: Private repository with authentication
-#
-# docker_registry: "172.16.0.10:4000"
-# docker_namespace: "companyname"
-# docker_registry_username: "sam"
-# docker_registry_password: "correcthorsebatterystaple"
+
+#docker_registry: "172.16.0.10:4000"
+#docker_namespace: "companyname"
+#docker_registry_username: "sam"
+#docker_registry_password: "correcthorsebatterystaple"
####################
@@ -78,8 +78,8 @@ neutron_external_interface: "eth1"
# To provide encryption and authentication on the kolla_external_vip_interface,
# TLS can be enabled. When TLS is enabled, certificates must be provided to
# allow clients to perform authentication. The default is TLS disabled.
-# kolla_enable_tls_external: "yes"
-# kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem"
+#kolla_enable_tls_external: "yes"
+#kolla_external_fqdn_cert: "{{ node_config_directory }}/certificates/haproxy.pem"
####################
@@ -95,6 +95,7 @@ neutron_external_interface: "eth1"
#enable_cinder: "yes"
#enable_heat: "no"
#enable_magnum: "no"
+#enable_swift: "yes"
###################
@@ -104,14 +105,33 @@ neutron_external_interface: "eth1"
# must provide separate disks than those for the OSDs
# ceph_use_cache: "no"
# Valid options are [ forward, none, writeback ]
-# ceph_cache_mode: "writeback"
+#ceph_cache_mode: "writeback"
# A requirement for using the erasure-coded pools is you must setup a cache tier
# Valid options are [ erasure, replicated ]
-# ceph_pool_type: "replicated"
+#ceph_pool_type: "replicated"
#######################################
# Manila - Shared File Systems Options
#######################################
-# manila_enable_dhss: "yes"
+#manila_enable_dhss: "yes"
+
+
+#######################################
+# Swift options
+#######################################
+# Swift expects block devices to be available for storage. Two types of storage
+# are supported: 1 - storage device with a special partition name and filesystem
+# label, 2 - unpartitioned disk with a filesystem. The label of this filesystem
+# is used to detect the disk which Swift will be using.
+
+# Swift support two mathcing modes, valid options are [ prefix, strict ]
+#swift_devices_match_mode: "strict"
+
+# This parameter defines matching pattern: if "strict" mode was selected,
+# for swift_devices_match_mode then swift_device_name should specify the name of
+# the special swift partition for example: "KOLLA_SWIFT_DATA", if "prefix" mode was
+# selected then swift_devices_name should specify a pattern which would match to
+# filesystems' labels prepared for swift.
+#swift_devices_name: "KOLLA_SWIFT_DATA"