From b1206670310b3c5198cf62101a3e7f5a8bd4bf09 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Wed, 6 Sep 2017 10:13:00 -0500
Subject: [PATCH] Endpoint lookups: fix typo in overrides

This PS fixes a typo in the endpoint lookup function and input.

Change-Id: I6ff6d68bf82e1e1f70438a7017f4e1a6df7f59a7
---
 barbican/values.yaml                           | 10 +++++-----
 ceph/values.yaml                               |  2 +-
 cinder/values.yaml                             | 18 +++++++++---------
 glance/values.yaml                             | 12 ++++++------
 heat/values.yaml                               | 14 +++++++-------
 .../_authenticated_endpoint_uri_lookup.tpl     |  2 +-
 .../_host_and_port_endpoint_uri_lookup.tpl     |  2 +-
 .../_hostname_fqdn_endpoint_lookup.tpl         |  2 +-
 .../_hostname_namespaced_endpoint_lookup.tpl   |  2 +-
 .../_keystone_endpoint_uri_lookup.tpl          |  2 +-
 horizon/values.yaml                            |  8 ++++----
 keystone/values.yaml                           |  8 ++++----
 magnum/values.yaml                             | 10 +++++-----
 mariadb/values.yaml                            |  2 +-
 mistral/values.yaml                            | 10 +++++-----
 neutron/values.yaml                            | 12 ++++++------
 nova/values.yaml                               | 18 +++++++++---------
 rabbitmq/values.yaml                           |  2 +-
 senlin/values.yaml                             | 10 +++++-----
 19 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/barbican/values.yaml b/barbican/values.yaml
index ae4cfa018c..1f1ca48b19 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -326,7 +326,7 @@ endpoints:
     hosts:
       default: keystone-api
       public: keystone
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v3
@@ -342,7 +342,7 @@ endpoints:
     hosts:
       default: barbican-api
       public: barbican
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v1
@@ -362,7 +362,7 @@ endpoints:
         password: password
     hosts:
       default: mariadb
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /barbican
     scheme: mysql+pymysql
@@ -379,7 +379,7 @@ endpoints:
         password: password
     hosts:
       default: rabbitmq
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /
     scheme: rabbit
@@ -389,7 +389,7 @@ endpoints:
   oslo_cache:
     hosts:
       default: memcached
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     port:
       memcache:
diff --git a/ceph/values.yaml b/ceph/values.yaml
index e3a35fdd7e..690a1ec0f1 100644
--- a/ceph/values.yaml
+++ b/ceph/values.yaml
@@ -278,7 +278,7 @@ endpoints:
   ceph_mon:
     hosts:
       default: ceph-mon
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     port:
       mon:
diff --git a/cinder/values.yaml b/cinder/values.yaml
index 68f76d0950..6f97ecbb5b 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -477,7 +477,7 @@ endpoints:
     hosts:
       default: keystone-api
       public: keystone
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v3
@@ -493,7 +493,7 @@ endpoints:
     hosts:
       default: glance-api
       public: glance
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: null
@@ -508,7 +508,7 @@ endpoints:
     hosts:
       default: glance-registry
       public: glance-reg
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: null
@@ -523,7 +523,7 @@ endpoints:
     hosts:
       default: cinder-api
       public: cinder
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: '/v1/%(tenant_id)s'
@@ -538,7 +538,7 @@ endpoints:
     hosts:
       default: cinder-api
       public: cinder
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: '/v2/%(tenant_id)s'
@@ -553,7 +553,7 @@ endpoints:
     hosts:
       default: cinder-api
       public: cinder
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: '/v3/%(tenant_id)s'
@@ -573,7 +573,7 @@ endpoints:
         password: password
     hosts:
       default: mariadb
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /cinder
     scheme: mysql+pymysql
@@ -590,7 +590,7 @@ endpoints:
         password: password
     hosts:
       default: rabbitmq
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /
     scheme: rabbit
@@ -600,7 +600,7 @@ endpoints:
   oslo_cache:
     hosts:
       default: memcached
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     port:
       memcache:
diff --git a/glance/values.yaml b/glance/values.yaml
index 93f49a5215..616e05b531 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -291,7 +291,7 @@ endpoints:
     hosts:
       default: keystone-api
       public: keystone
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v3
@@ -307,7 +307,7 @@ endpoints:
     hosts:
       default: glance-api
       public: glance
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: null
@@ -322,7 +322,7 @@ endpoints:
     hosts:
       default: glance-registry
       public: glance-reg
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: null
@@ -342,7 +342,7 @@ endpoints:
         password: password
     hosts:
       default: mariadb
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /glance
     scheme: mysql+pymysql
@@ -352,7 +352,7 @@ endpoints:
   oslo_cache:
     hosts:
       default: memcached
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     port:
       memcache:
@@ -367,7 +367,7 @@ endpoints:
         password: password
     hosts:
       default: rabbitmq
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /
     scheme: rabbit
diff --git a/heat/values.yaml b/heat/values.yaml
index c6cec8f735..cc6f16f986 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -332,7 +332,7 @@ endpoints:
     hosts:
       default: keystone-api
       public: keystone
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v3
@@ -348,7 +348,7 @@ endpoints:
     hosts:
       default: heat-api
       public: heat
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: '/v1/%(project_id)s'
@@ -363,7 +363,7 @@ endpoints:
     hosts:
       default: heat-cfn
       public: cloudformation
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v1
@@ -379,7 +379,7 @@ endpoints:
     hosts:
       default: heat-cloudwatch
       public: cloudwatch
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: null
@@ -400,7 +400,7 @@ endpoints:
         password: password
     hosts:
       default: mariadb
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /heat
     scheme: mysql+pymysql
@@ -410,7 +410,7 @@ endpoints:
   oslo_cache:
     hosts:
       default: memcached
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     port:
       memcache:
@@ -425,7 +425,7 @@ endpoints:
         password: password
     hosts:
       default: rabbitmq
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /
     scheme: rabbit
diff --git a/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl b/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl
index b28bba3961..249d00a4c9 100644
--- a/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl
+++ b/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl
@@ -41,7 +41,7 @@ limitations under the License.
 {{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }}
 {{- $endpointPath := .path | default "" }}
 {{- $endpointClusterHostname := printf "%s.%s.%s" $endpointHost $namespace $clusterSuffix }}
-{{- $endpointHostname := index .host_fqdn_overide $endpoint | default .host_fqdn_overide.default | default $endpointClusterHostname }}
+{{- $endpointHostname := index .host_fqdn_override $endpoint | default .host_fqdn_override.default | default $endpointClusterHostname }}
 {{- printf "%s://%s:%s@%s:%1.f%s" $endpointScheme $endpointUser $endpointPass $endpointHostname $endpointPort $endpointPath -}}
 {{- end -}}
 {{- end -}}
diff --git a/helm-toolkit/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl b/helm-toolkit/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl
index c9154db356..93f8227263 100644
--- a/helm-toolkit/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl
+++ b/helm-toolkit/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl
@@ -36,7 +36,7 @@ limitations under the License.
 {{- $endpointPortMAP := index .port $port }}
 {{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }}
 {{- $endpointClusterHostname := printf "%s.%s.%s" $endpointHost $namespace $clusterSuffix }}
-{{- $endpointHostname := index .host_fqdn_overide $endpoint | default .host_fqdn_overide.default | default $endpointClusterHostname }}
+{{- $endpointHostname := index .host_fqdn_override $endpoint | default .host_fqdn_override.default | default $endpointClusterHostname }}
 {{- printf "%s:%1.f" $endpointHostname $endpointPort -}}
 {{- end -}}
 {{- end -}}
diff --git a/helm-toolkit/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl b/helm-toolkit/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl
index 916efc9c2f..4bd07f56d6 100644
--- a/helm-toolkit/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl
+++ b/helm-toolkit/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl
@@ -31,7 +31,7 @@ limitations under the License.
 {{- $endpointScheme := .scheme }}
 {{- $endpointHost := index .hosts $endpoint | default .hosts.default }}
 {{- $endpointClusterHostname := printf "%s.%s.%s" $endpointHost $namespace $clusterSuffix }}
-{{- $endpointHostname := index .host_fqdn_overide $endpoint | default .host_fqdn_overide.default | default $endpointClusterHostname }}
+{{- $endpointHostname := index .host_fqdn_override $endpoint | default .host_fqdn_override.default | default $endpointClusterHostname }}
 {{- printf "%s" $endpointHostname -}}
 {{- end -}}
 {{- end -}}
diff --git a/helm-toolkit/templates/endpoints/_hostname_namespaced_endpoint_lookup.tpl b/helm-toolkit/templates/endpoints/_hostname_namespaced_endpoint_lookup.tpl
index 5541c727f0..59844a2800 100644
--- a/helm-toolkit/templates/endpoints/_hostname_namespaced_endpoint_lookup.tpl
+++ b/helm-toolkit/templates/endpoints/_hostname_namespaced_endpoint_lookup.tpl
@@ -30,7 +30,7 @@ limitations under the License.
 {{- $endpointScheme := .scheme }}
 {{- $endpointHost := index .hosts $endpoint | default .hosts.default }}
 {{- $endpointClusterHostname := printf "%s.%s" $endpointHost $namespace }}
-{{- $endpointHostname := index .host_fqdn_overide $endpoint | default .host_fqdn_overide.default | default $endpointClusterHostname }}
+{{- $endpointHostname := index .host_fqdn_override $endpoint | default .host_fqdn_override.default | default $endpointClusterHostname }}
 {{- printf "%s" $endpointHostname -}}
 {{- end -}}
 {{- end -}}
diff --git a/helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl b/helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl
index fa9a6dda8a..b0c5b43d5f 100644
--- a/helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl
+++ b/helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl
@@ -34,7 +34,7 @@ limitations under the License.
 {{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }}
 {{- $endpointPath := index .path $endpoint | default .path.default | default "/" }}
 {{- $endpointClusterHostname := printf "%s.%s.%s" $endpointHost $namespace $clusterSuffix }}
-{{- $endpointHostname := index .host_fqdn_overide $endpoint | default .host_fqdn_overide.default | default $endpointClusterHostname }}
+{{- $endpointHostname := index .host_fqdn_override $endpoint | default .host_fqdn_override.default | default $endpointClusterHostname }}
 {{- printf "%s://%s:%1.f%s" $endpointScheme $endpointHostname $endpointPort $endpointPath -}}
 {{- end -}}
 {{- end -}}
diff --git a/horizon/values.yaml b/horizon/values.yaml
index 7b569aead5..df891c09bf 100644
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@@ -1196,7 +1196,7 @@ endpoints:
     hosts:
       default: keystone-api
       public: keystone
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v3
@@ -1210,7 +1210,7 @@ endpoints:
   oslo_cache:
     hosts:
       default: memcached
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     port:
       memcache:
@@ -1220,7 +1220,7 @@ endpoints:
     hosts:
       default: horizon-int
       public: horizon
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: null
@@ -1239,7 +1239,7 @@ endpoints:
         password: password
     hosts:
       default: mariadb
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /horizon
     scheme: mysql+pymysql
diff --git a/keystone/values.yaml b/keystone/values.yaml
index cdd890f24e..7144be46ec 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -475,7 +475,7 @@ endpoints:
     hosts:
       default: keystone-api
       public: keystone
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v3
@@ -497,7 +497,7 @@ endpoints:
         password: password
     hosts:
       default: mariadb
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /keystone
     scheme: mysql+pymysql
@@ -515,7 +515,7 @@ endpoints:
         password: password
     hosts:
       default: rabbitmq
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /openstack
     scheme: rabbit
@@ -526,7 +526,7 @@ endpoints:
     namespace: null
     hosts:
       default: memcached
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     port:
       memcache:
diff --git a/magnum/values.yaml b/magnum/values.yaml
index 6dee895887..daab9d0f87 100644
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@@ -190,7 +190,7 @@ endpoints:
     hosts:
       default: keystone-api
       public: keystone
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v3
@@ -206,7 +206,7 @@ endpoints:
     hosts:
       default: magnum-api
       public: magnum
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v1
@@ -226,7 +226,7 @@ endpoints:
         password: password
     hosts:
       default: mariadb
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /magnum
     scheme: mysql+pymysql
@@ -236,7 +236,7 @@ endpoints:
   oslo_cache:
     hosts:
       default: memcached
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     port:
       memcache:
@@ -251,7 +251,7 @@ endpoints:
         password: password
     hosts:
       default: rabbitmq
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /
     scheme: rabbit
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index adf115a297..5293f9dabc 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -80,7 +80,7 @@ endpoints:
     hosts:
       default: mariadb
       discovery: mariadb-discovery
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: null
     scheme: mysql+pymysql
diff --git a/mistral/values.yaml b/mistral/values.yaml
index 6f987c36c5..1fb1c19bb4 100644
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@@ -151,7 +151,7 @@ endpoints:
     hosts:
       default: keystone-api
       public: keystone
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v3
@@ -167,7 +167,7 @@ endpoints:
     hosts:
       default: mistral-api
       public: mistral
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v2
@@ -187,7 +187,7 @@ endpoints:
         password: password
     hosts:
       default: mariadb
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /mistral
     scheme: mysql+pymysql
@@ -204,7 +204,7 @@ endpoints:
         password: password
     hosts:
       default: rabbitmq
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /
     scheme: rabbit
@@ -214,7 +214,7 @@ endpoints:
   oslo_cache:
     hosts:
       default: memcached
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     port:
       memcache:
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 6a32775d59..8b44eca483 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -820,7 +820,7 @@ endpoints:
          password: password
      hosts:
        default: mariadb
-     host_fqdn_overide:
+     host_fqdn_override:
        default: null
      path: /neutron
      scheme: mysql+pymysql
@@ -837,7 +837,7 @@ endpoints:
          password: password
      hosts:
        default: rabbitmq
-     host_fqdn_overide:
+     host_fqdn_override:
        default: null
      path: /
      scheme: rabbit
@@ -847,7 +847,7 @@ endpoints:
   oslo_cache:
      hosts:
        default: memcached
-     host_fqdn_overide:
+     host_fqdn_override:
        default: null
      port:
        memcache:
@@ -857,7 +857,7 @@ endpoints:
     hosts:
       default: nova-api
       public: nova
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: "/v2/%(tenant_id)s"
@@ -892,7 +892,7 @@ endpoints:
     hosts:
       default: keystone-api
       public: keystone
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v3
@@ -908,7 +908,7 @@ endpoints:
     hosts:
       default: neutron-server
       public: neutron
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: null
diff --git a/nova/values.yaml b/nova/values.yaml
index 4504b336d4..a93027b839 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -685,7 +685,7 @@ endpoints:
         password: password
     hosts:
       default: mariadb
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /nova
     scheme: mysql+pymysql
@@ -702,7 +702,7 @@ endpoints:
         password: password
     hosts:
       default: mariadb
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /nova_api
     scheme: mysql+pymysql
@@ -719,7 +719,7 @@ endpoints:
         password: password
     hosts:
       default: rabbitmq
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /
     scheme: rabbit
@@ -729,7 +729,7 @@ endpoints:
   oslo_cache:
     hosts:
       default: memcached
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     port:
       memcache:
@@ -755,7 +755,7 @@ endpoints:
     hosts:
       default: keystone-api
       public: keystone
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v3
@@ -771,7 +771,7 @@ endpoints:
     hosts:
       default: glance-api
       public: glance
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: null
@@ -786,7 +786,7 @@ endpoints:
     hosts:
       default: nova-api
       public: nova
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: "/v2/%(tenant_id)s"
@@ -803,7 +803,7 @@ endpoints:
     hosts:
       default: nova-metadata
       public: metadata
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /
@@ -818,7 +818,7 @@ endpoints:
     hosts:
       default: neutron-server
       public: neutron
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: null
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index 4306c1bfbb..b1db45f83d 100644
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -74,7 +74,7 @@ endpoints:
   etcd:
     hosts:
       default: etcd
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     port: 2379
 
diff --git a/senlin/values.yaml b/senlin/values.yaml
index 45383bfce8..3f10195d85 100644
--- a/senlin/values.yaml
+++ b/senlin/values.yaml
@@ -194,7 +194,7 @@ endpoints:
     hosts:
       default: keystone-api
       public: keystone
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: /v3
@@ -210,7 +210,7 @@ endpoints:
     hosts:
       default: senlin-api
       public: senlin
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path:
       default: null
@@ -230,7 +230,7 @@ endpoints:
         password: password
     hosts:
       default: mariadb
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /senlin
     scheme: mysql+pymysql
@@ -240,7 +240,7 @@ endpoints:
   oslo_cache:
     hosts:
       default: memcached
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     port:
       memcache:
@@ -255,7 +255,7 @@ endpoints:
         password: password
     hosts:
       default: rabbitmq
-    host_fqdn_overide:
+    host_fqdn_override:
       default: null
     path: /
     scheme: rabbit