From 3086d7b8ac1f3073d316fe93e2a83afa4bf94eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= <jiri.suchomel@suse.com>
Date: Wed, 26 Jun 2019 09:45:37 +0200
Subject: [PATCH] [Doc] Fix the reference to the helm-toolkit macro used in
example
Change-Id: I7733f4989cce223148464d295d57fd8812fcf963
---
doc/source/devref/endpoints.rst | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/doc/source/devref/endpoints.rst b/doc/source/devref/endpoints.rst
index 5ab3b5eef3..793d2e238a 100644
--- a/doc/source/devref/endpoints.rst
+++ b/doc/source/devref/endpoints.rst
@@ -73,15 +73,18 @@ template:
::
- +glance_api_servers = {{ tuple "image" "internal" "api" . | include "helm-toolkit.endpoint_type_lookup_addr" }}
+ {{- if empty .Values.conf.cinder.DEFAULT.glance_api_servers -}}
+ {{- $_ := tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.cinder.DEFAULT "glance_api_servers" -}}
+ {{- end -}}
-As an example, this line uses the ``endpoint_type_lookup_addr`` macro in
-the ``helm-toolkit`` chart (since it is used by all charts). Note that
+
+As an example, this line uses the ``endpoints.keystone_endpoint_uri_lookup``
+macro in the ``helm-toolkit`` chart (since it is used by all charts). Note that
there is a second convention here. All ``{{ define }}`` macros in charts
should be pre-fixed with the chart that is defining them. This allows
developers to easily identify the source of a Helm macro and also avoid
namespace collisions. In the example above, the macro
-``endpoint_type_lookup_addr`` is defined in the ``helm-toolkit`` chart.
+``endpoints.keystone_endpoint_uri_lookup`` is defined in the ``helm-toolkit`` chart.
This macro is passing three parameters (aided by the ``tuple`` method
built into the go/sprig templating library used by Helm):