From 377264ae9e65894b32707009967b4ed83ff4d1e5 Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Fri, 20 May 2016 05:52:14 -0400
Subject: [PATCH] Document using a custom config directory

Change-Id: I341a42f3407e33fa26f495aced3b062ed5b21890
partially-implements: blueprint documentation-rework
---
 doc/advanced-configuration.rst | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/doc/advanced-configuration.rst b/doc/advanced-configuration.rst
index 334c38a748..9ba0f0d318 100644
--- a/doc/advanced-configuration.rst
+++ b/doc/advanced-configuration.rst
@@ -145,13 +145,19 @@ OpenStack Service Configuration in Kolla
 ========================================
 
 .. NOTE:: As of now kolla only supports config overrides for ini based configs.
+An operator can change the location where custom config files are read from by
+editing ``/etc/kolla/globals.yml`` and adding the following line.
 
-Kolla allows deployer to override configuration of services. Kolla will look
-for file in ``/etc/kolla/config/<< sevice name >>/<< config file >>``. This can
-be done per-project, per-service or per-service-on-specified-host.
+::
 
+   # The directory to merge custom config files the kolla's config files
+   node_custom_config: "/etc/kolla/config"
+
+Kolla allows the operator to override configuration of services. Kolla will look
+for a file in ``/etc/kolla/config/<< sevice name >>/<< config file >>``. This
+can be done per-project, per-service or per-service-on-specified-host.
 For example to override scheduler_max_attempts in nova scheduler, the operator
-need to create ``/etc/kolla/config/nova/nova-scheduler.conf`` with content:
+needs to create ``/etc/kolla/config/nova/nova-scheduler.conf`` with content:
 
 ::