openstack/openstack-helm
Code Issues Proposed changes

Endpoint lookups: fix typo in overrides

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

Change-Id: I6ff6d68bf82e1e1f70438a7017f4e1a6df7f59a7
This commit is contained in:
Pete Birley 2017-09-06 10:13:00 -05:00
parent 4976b398fa
commit b120667031
19 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
barbican/values.yaml
View File

@ -326,7 +326,7 @@ endpoints:
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v3 default: /v3
@ -342,7 +342,7 @@ endpoints:
hosts: hosts:
default: barbican-api default: barbican-api
public: barbican public: barbican
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v1 default: /v1
@ -362,7 +362,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: mariadb default: mariadb
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /barbican path: /barbican
scheme: mysql+pymysql scheme: mysql+pymysql
@ -379,7 +379,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: rabbitmq default: rabbitmq
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: / path: /
scheme: rabbit scheme: rabbit
@ -389,7 +389,7 @@ endpoints:
oslo_cache: oslo_cache:
hosts: hosts:
default: memcached default: memcached
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: port:
memcache: memcache:

2
ceph/values.yaml
View File

@ -278,7 +278,7 @@ endpoints:
ceph_mon: ceph_mon:
hosts: hosts:
default: ceph-mon default: ceph-mon
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: port:
mon: mon:

18
cinder/values.yaml
View File

@ -477,7 +477,7 @@ endpoints:
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v3 default: /v3
@ -493,7 +493,7 @@ endpoints:
hosts: hosts:
default: glance-api default: glance-api
public: glance public: glance
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: null default: null
@ -508,7 +508,7 @@ endpoints:
hosts: hosts:
default: glance-registry default: glance-registry
public: glance-reg public: glance-reg
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: null default: null
@ -523,7 +523,7 @@ endpoints:
hosts: hosts:
default: cinder-api default: cinder-api
public: cinder public: cinder
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: '/v1/%(tenant_id)s' default: '/v1/%(tenant_id)s'
@ -538,7 +538,7 @@ endpoints:
hosts: hosts:
default: cinder-api default: cinder-api
public: cinder public: cinder
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: '/v2/%(tenant_id)s' default: '/v2/%(tenant_id)s'
@ -553,7 +553,7 @@ endpoints:
hosts: hosts:
default: cinder-api default: cinder-api
public: cinder public: cinder
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: '/v3/%(tenant_id)s' default: '/v3/%(tenant_id)s'
@ -573,7 +573,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: mariadb default: mariadb
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /cinder path: /cinder
scheme: mysql+pymysql scheme: mysql+pymysql
@ -590,7 +590,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: rabbitmq default: rabbitmq
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: / path: /
scheme: rabbit scheme: rabbit
@ -600,7 +600,7 @@ endpoints:
oslo_cache: oslo_cache:
hosts: hosts:
default: memcached default: memcached
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: port:
memcache: memcache:

12
glance/values.yaml
View File

@ -291,7 +291,7 @@ endpoints:
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v3 default: /v3
@ -307,7 +307,7 @@ endpoints:
hosts: hosts:
default: glance-api default: glance-api
public: glance public: glance
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: null default: null
@ -322,7 +322,7 @@ endpoints:
hosts: hosts:
default: glance-registry default: glance-registry
public: glance-reg public: glance-reg
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: null default: null
@ -342,7 +342,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: mariadb default: mariadb
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /glance path: /glance
scheme: mysql+pymysql scheme: mysql+pymysql
@ -352,7 +352,7 @@ endpoints:
oslo_cache: oslo_cache:
hosts: hosts:
default: memcached default: memcached
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: port:
memcache: memcache:
@ -367,7 +367,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: rabbitmq default: rabbitmq
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: / path: /
scheme: rabbit scheme: rabbit

14
heat/values.yaml
View File

@ -332,7 +332,7 @@ endpoints:
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v3 default: /v3
@ -348,7 +348,7 @@ endpoints:
hosts: hosts:
default: heat-api default: heat-api
public: heat public: heat
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: '/v1/%(project_id)s' default: '/v1/%(project_id)s'
@ -363,7 +363,7 @@ endpoints:
hosts: hosts:
default: heat-cfn default: heat-cfn
public: cloudformation public: cloudformation
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v1 default: /v1
@ -379,7 +379,7 @@ endpoints:
hosts: hosts:
default: heat-cloudwatch default: heat-cloudwatch
public: cloudwatch public: cloudwatch
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: null default: null
@ -400,7 +400,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: mariadb default: mariadb
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /heat path: /heat
scheme: mysql+pymysql scheme: mysql+pymysql
@ -410,7 +410,7 @@ endpoints:
oslo_cache: oslo_cache:
hosts: hosts:
default: memcached default: memcached
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: port:
memcache: memcache:
@ -425,7 +425,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: rabbitmq default: rabbitmq
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: / path: /
scheme: rabbit scheme: rabbit

2
helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl
View File

@ -41,7 +41,7 @@ limitations under the License.
{{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }} {{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }}
{{- $endpointPath := .path | default "" }} {{- $endpointPath := .path | default "" }}
{{- $endpointClusterHostname := printf "%s.%s.%s" $endpointHost $namespace $clusterSuffix }} {{- $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 -}} {{- printf "%s://%s:%s@%s:%1.f%s" $endpointScheme $endpointUser $endpointPass $endpointHostname $endpointPort $endpointPath -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

2
helm-toolkit/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl
View File

@ -36,7 +36,7 @@ limitations under the License.
{{- $endpointPortMAP := index .port $port }} {{- $endpointPortMAP := index .port $port }}
{{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }} {{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }}
{{- $endpointClusterHostname := printf "%s.%s.%s" $endpointHost $namespace $clusterSuffix }} {{- $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 -}} {{- printf "%s:%1.f" $endpointHostname $endpointPort -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

2
helm-toolkit/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl
View File

@ -31,7 +31,7 @@ limitations under the License.
{{- $endpointScheme := .scheme }} {{- $endpointScheme := .scheme }}
{{- $endpointHost := index .hosts $endpoint | default .hosts.default }} {{- $endpointHost := index .hosts $endpoint | default .hosts.default }}
{{- $endpointClusterHostname := printf "%s.%s.%s" $endpointHost $namespace $clusterSuffix }} {{- $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 -}} {{- printf "%s" $endpointHostname -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

2
helm-toolkit/templates/endpoints/_hostname_namespaced_endpoint_lookup.tpl
View File

@ -30,7 +30,7 @@ limitations under the License.
{{- $endpointScheme := .scheme }} {{- $endpointScheme := .scheme }}
{{- $endpointHost := index .hosts $endpoint | default .hosts.default }} {{- $endpointHost := index .hosts $endpoint | default .hosts.default }}
{{- $endpointClusterHostname := printf "%s.%s" $endpointHost $namespace }} {{- $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 -}} {{- printf "%s" $endpointHostname -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

2
helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl
View File

@ -34,7 +34,7 @@ limitations under the License.
{{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }} {{- $endpointPort := index $endpointPortMAP $endpoint | default (index $endpointPortMAP "default") }}
{{- $endpointPath := index .path $endpoint | default .path.default | default "/" }} {{- $endpointPath := index .path $endpoint | default .path.default | default "/" }}
{{- $endpointClusterHostname := printf "%s.%s.%s" $endpointHost $namespace $clusterSuffix }} {{- $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 -}} {{- printf "%s://%s:%1.f%s" $endpointScheme $endpointHostname $endpointPort $endpointPath -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

8
horizon/values.yaml
View File

@ -1196,7 +1196,7 @@ endpoints:
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v3 default: /v3
@ -1210,7 +1210,7 @@ endpoints:
oslo_cache: oslo_cache:
hosts: hosts:
default: memcached default: memcached
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: port:
memcache: memcache:
@ -1220,7 +1220,7 @@ endpoints:
hosts: hosts:
default: horizon-int default: horizon-int
public: horizon public: horizon
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: null default: null
@ -1239,7 +1239,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: mariadb default: mariadb
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /horizon path: /horizon
scheme: mysql+pymysql scheme: mysql+pymysql

8
keystone/values.yaml
View File

@ -475,7 +475,7 @@ endpoints:
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v3 default: /v3
@ -497,7 +497,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: mariadb default: mariadb
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /keystone path: /keystone
scheme: mysql+pymysql scheme: mysql+pymysql
@ -515,7 +515,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: rabbitmq default: rabbitmq
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /openstack path: /openstack
scheme: rabbit scheme: rabbit
@ -526,7 +526,7 @@ endpoints:
namespace: null namespace: null
hosts: hosts:
default: memcached default: memcached
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: port:
memcache: memcache:

10
magnum/values.yaml
View File

@ -190,7 +190,7 @@ endpoints:
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v3 default: /v3
@ -206,7 +206,7 @@ endpoints:
hosts: hosts:
default: magnum-api default: magnum-api
public: magnum public: magnum
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v1 default: /v1
@ -226,7 +226,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: mariadb default: mariadb
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /magnum path: /magnum
scheme: mysql+pymysql scheme: mysql+pymysql
@ -236,7 +236,7 @@ endpoints:
oslo_cache: oslo_cache:
hosts: hosts:
default: memcached default: memcached
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: port:
memcache: memcache:
@ -251,7 +251,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: rabbitmq default: rabbitmq
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: / path: /
scheme: rabbit scheme: rabbit

2
mariadb/values.yaml
View File

@ -80,7 +80,7 @@ endpoints:
hosts: hosts:
default: mariadb default: mariadb
discovery: mariadb-discovery discovery: mariadb-discovery
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: null path: null
scheme: mysql+pymysql scheme: mysql+pymysql

10
mistral/values.yaml
View File

@ -151,7 +151,7 @@ endpoints:
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v3 default: /v3
@ -167,7 +167,7 @@ endpoints:
hosts: hosts:
default: mistral-api default: mistral-api
public: mistral public: mistral
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v2 default: /v2
@ -187,7 +187,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: mariadb default: mariadb
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /mistral path: /mistral
scheme: mysql+pymysql scheme: mysql+pymysql
@ -204,7 +204,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: rabbitmq default: rabbitmq
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: / path: /
scheme: rabbit scheme: rabbit
@ -214,7 +214,7 @@ endpoints:
oslo_cache: oslo_cache:
hosts: hosts:
default: memcached default: memcached
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: port:
memcache: memcache:

12
neutron/values.yaml
View File

@ -820,7 +820,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: mariadb default: mariadb
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /neutron path: /neutron
scheme: mysql+pymysql scheme: mysql+pymysql
@ -837,7 +837,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: rabbitmq default: rabbitmq
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: / path: /
scheme: rabbit scheme: rabbit
@ -847,7 +847,7 @@ endpoints:
oslo_cache: oslo_cache:
hosts: hosts:
default: memcached default: memcached
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: port:
memcache: memcache:
@ -857,7 +857,7 @@ endpoints:
hosts: hosts:
default: nova-api default: nova-api
public: nova public: nova
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: "/v2/%(tenant_id)s" default: "/v2/%(tenant_id)s"
@ -892,7 +892,7 @@ endpoints:
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v3 default: /v3
@ -908,7 +908,7 @@ endpoints:
hosts: hosts:
default: neutron-server default: neutron-server
public: neutron public: neutron
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: null default: null

18
nova/values.yaml
View File

@ -685,7 +685,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: mariadb default: mariadb
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /nova path: /nova
scheme: mysql+pymysql scheme: mysql+pymysql
@ -702,7 +702,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: mariadb default: mariadb
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /nova_api path: /nova_api
scheme: mysql+pymysql scheme: mysql+pymysql
@ -719,7 +719,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: rabbitmq default: rabbitmq
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: / path: /
scheme: rabbit scheme: rabbit
@ -729,7 +729,7 @@ endpoints:
oslo_cache: oslo_cache:
hosts: hosts:
default: memcached default: memcached
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: port:
memcache: memcache:
@ -755,7 +755,7 @@ endpoints:
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v3 default: /v3
@ -771,7 +771,7 @@ endpoints:
hosts: hosts:
default: glance-api default: glance-api
public: glance public: glance
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: null default: null
@ -786,7 +786,7 @@ endpoints:
hosts: hosts:
default: nova-api default: nova-api
public: nova public: nova
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: "/v2/%(tenant_id)s" default: "/v2/%(tenant_id)s"
@ -803,7 +803,7 @@ endpoints:
hosts: hosts:
default: nova-metadata default: nova-metadata
public: metadata public: metadata
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: / default: /
@ -818,7 +818,7 @@ endpoints:
hosts: hosts:
default: neutron-server default: neutron-server
public: neutron public: neutron
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: null default: null

2
rabbitmq/values.yaml
View File

@ -74,7 +74,7 @@ endpoints:
etcd: etcd:
hosts: hosts:
default: etcd default: etcd
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: 2379 port: 2379

10
senlin/values.yaml
View File

@ -194,7 +194,7 @@ endpoints:
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: /v3 default: /v3
@ -210,7 +210,7 @@ endpoints:
hosts: hosts:
default: senlin-api default: senlin-api
public: senlin public: senlin
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: path:
default: null default: null
@ -230,7 +230,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: mariadb default: mariadb
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: /senlin path: /senlin
scheme: mysql+pymysql scheme: mysql+pymysql
@ -240,7 +240,7 @@ endpoints:
oslo_cache: oslo_cache:
hosts: hosts:
default: memcached default: memcached
host_fqdn_overide: host_fqdn_override:
default: null default: null
port: port:
memcache: memcache:
@ -255,7 +255,7 @@ endpoints:
password: password password: password
hosts: hosts:
default: rabbitmq default: rabbitmq
host_fqdn_overide: host_fqdn_override:
default: null default: null
path: / path: /
scheme: rabbit scheme: rabbit