From 37f3f14bb1ee011e1f911c42a2785f6c631cc1e6 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Tue, 20 Aug 2019 16:32:49 +0400 Subject: [PATCH] [neutron] Support the external dns driver Change-Id: I1c7e31be45d31a724911c7e12c2607a15093941b --- neutron/templates/configmap-etc.yaml | 21 +++++++++++++++++++++ neutron/values.yaml | 28 ++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml index 8dd37d2fd1..0e06750107 100644 --- a/neutron/templates/configmap-etc.yaml +++ b/neutron/templates/configmap-etc.yaml @@ -177,6 +177,27 @@ just set it along with nova_metadata_host. {{- end -}} {{- end -}} +{{/* Designate DNS driver */}} +{{- if eq (.Values.conf.neutron.DEFAULT.external_dns_driver | default "") "designate" -}} +{{- if empty .Values.conf.neutron.designate.project_name -}} +{{- $_ := set .Values.conf.neutron.designate "project_name" .Values.endpoints.identity.auth.designate.project_name -}} +{{- end -}} +{{- if empty .Values.conf.neutron.designate.project_domain_name -}} +{{- $_ := set .Values.conf.neutron.designate "project_domain_name" .Values.endpoints.identity.auth.designate.project_domain_name -}} +{{- end -}} +{{- if empty .Values.conf.neutron.designate.user_domain_name -}} +{{- $_ := set .Values.conf.neutron.designate "user_domain_name" .Values.endpoints.identity.auth.designate.user_domain_name -}} +{{- end -}} +{{- if empty .Values.conf.neutron.designate.username -}} +{{- $_ := set .Values.conf.neutron.designate "username" .Values.endpoints.identity.auth.designate.username -}} +{{- end -}} +{{- if empty .Values.conf.neutron.designate.password -}} +{{- $_ := set .Values.conf.neutron.designate "password" .Values.endpoints.identity.auth.designate.password -}} +{{- end -}} +{{- if empty .Values.conf.neutron.designate.url -}} +{{- $_ := tuple "dns" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.neutron.designate "url" -}} +{{- end -}} +{{- end }} --- apiVersion: v1 kind: Secret diff --git a/neutron/values.yaml b/neutron/values.yaml index 14b03f0a29..456f93e1ca 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -1761,6 +1761,11 @@ conf: auth_type: password auth_version: v3 endpoint_type: internal + designate: + auth_type: password + auth_version: v3 + endpoint_type: internal + allow_reverse_dns_lookup: true keystone_authtoken: memcache_security_strategy: ENCRYPT auth_type: password @@ -2107,6 +2112,13 @@ endpoints: password: password user_domain_name: service project_domain_name: service + designate: + region_name: RegionOne + project_name: service + username: designate + password: password + user_domain_name: service + project_domain_name: service test: role: admin region_name: RegionOne @@ -2165,6 +2177,22 @@ endpoints: default: 24224 metrics: default: 24220 + dns: + name: designate + hosts: + default: designate-api + public: designate + host_fqdn_override: + default: null + path: + default: / + scheme: + default: 'http' + port: + api: + default: 9001 + public: 80 + #NOTE(tp6510): these endpoints allow for things like DNS lookups and apiserver access. # They are using to enable the Egress K8s network policy. k8s: