openstack/openstack-helm
Code Issues Proposed changes

Merge "Nova: Move Neutron credentials to endpoints in values.yaml"

Browse Source
This commit is contained in:
Zuul 2017-09-29 04:04:52 +00:00 committed by Gerrit Code Review
commit 8ff322d148
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nova/templates/configmap-etc.yaml
View File

@ -78,6 +78,25 @@ limitations under the License.
{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.neutron "auth_url" | quote | trunc 0 -}} {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.neutron "auth_url" | quote | trunc 0 -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.nova.neutron.region_name -}}
{{- set .Values.conf.nova.neutron "region_name" .Values.endpoints.identity.auth.neutron.region_name | quote | trunc 0 -}}
{{- end -}}
{{- if empty .Values.conf.nova.neutron.project_name -}}
{{- set .Values.conf.nova.neutron "project_name" .Values.endpoints.identity.auth.neutron.project_name | quote | trunc 0 -}}
{{- end -}}
{{- if empty .Values.conf.nova.neutron.project_domain_name -}}
{{- set .Values.conf.nova.neutron "project_domain_name" .Values.endpoints.identity.auth.neutron.project_domain_name | quote | trunc 0 -}}
{{- end -}}
{{- if empty .Values.conf.nova.neutron.user_domain_name -}}
{{- set .Values.conf.nova.neutron "user_domain_name" .Values.endpoints.identity.auth.neutron.user_domain_name | quote | trunc 0 -}}
{{- end -}}
{{- if empty .Values.conf.nova.neutron.username -}}
{{- set .Values.conf.nova.neutron "username" .Values.endpoints.identity.auth.neutron.username | quote | trunc 0 -}}
{{- end -}}
{{- if empty .Values.conf.nova.neutron.password -}}
{{- set .Values.conf.nova.neutron "password" .Values.endpoints.identity.auth.neutron.password | quote | trunc 0 -}}
{{- end -}}
{{- if empty .Values.conf.nova.cache.memcache_servers -}} {{- if empty .Values.conf.nova.cache.memcache_servers -}}
{{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.cache "memcache_servers" | quote | trunc 0 -}} {{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.nova.cache "memcache_servers" | quote | trunc 0 -}}
{{- end -}} {{- end -}}

13
nova/values.yaml
View File

@ -639,12 +639,6 @@ conf:
service_metadata_proxy: True service_metadata_proxy: True
auth_type: password auth_type: password
auth_version: v3 auth_version: v3
region_name: RegionOne
project_name: service
project_domain_name: default
user_domain_name: default
username: neutron
password: password
database: database:
max_retries: -1 max_retries: -1
api_database: api_database:
@ -764,6 +758,13 @@ endpoints:
project_name: service project_name: service
user_domain_name: default user_domain_name: default
project_domain_name: default project_domain_name: default
neutron:
region_name: RegionOne
project_name: service
project_domain_name: default
user_domain_name: default
username: neutron
password: password
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone