openstack/openstack-helm
Code Issues Proposed changes

Neutron: Move Nova credentials to endpoints in values.yaml

Browse Source 
This PS moves the nova credentials from the config section
of the values.yaml to the endpoints section, seperating them from
the service configuration.

Change-Id: Idfc696e0fc907b702a8ca81d81e50cb252cb7af8
This commit is contained in:
Pete Birley 2017-09-26 07:33:26 -05:00
parent d2190de96e
commit b8cc29f183
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

13
neutron/values.yaml
View File

@ -663,12 +663,6 @@ conf:
nova: nova:
auth_type: password auth_type: password
auth_version: v3 auth_version: v3
region_name: RegionOne
project_domain_name: default
project_name: service
user_domain_name: default
username: nova
password: password
keystone_authtoken: keystone_authtoken:
memcache_security_strategy: ENCRYPT memcache_security_strategy: ENCRYPT
auth_type: password auth_type: password
@ -838,6 +832,13 @@ endpoints:
project_name: service project_name: service
user_domain_name: default user_domain_name: default
project_domain_name: default project_domain_name: default
nova:
region_name: RegionOne
project_domain_name: default
project_name: service
user_domain_name: default
username: nova
password: password
hosts: hosts:
default: keystone-api default: keystone-api
public: keystone public: keystone