openstack/openstack-helm
Code Issues Proposed changes

Merge "Endpoint lookups: fix typo in overrides"

Browse Source
This commit is contained in:
Jenkins 2017-09-06 18:55:09 +00:00 committed by Gerrit Code Review
commit 8618b3c541
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:
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:

2
ceph/values.yaml
View File

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

18
cinder/values.yaml
View File

@ -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:

12
glance/values.yaml
View File

@ -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

14
heat/values.yaml
View File

@ -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

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") }}
{{- $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 -}}

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 }}
{{- $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 -}}

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

@ -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 -}}

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

@ -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 -}}

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") }}
{{- $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 -}}

8
horizon/values.yaml
View File

@ -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

8
keystone/values.yaml
View File

@ -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:

10
magnum/values.yaml
View File

@ -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

2
mariadb/values.yaml
View File

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

10
mistral/values.yaml
View File

@ -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:

12
neutron/values.yaml
View File

@ -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

18
nova/values.yaml
View File

@ -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

2
rabbitmq/values.yaml
View File

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

10
senlin/values.yaml
View File

@ -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