Merge "containerized fm public endpoint can not be accessed"

This commit is contained in:
Zuul 2019-06-14 15:27:21 +00:00 committed by Gerrit Code Review
commit feba4d21cb
2 changed files with 22 additions and 0 deletions

View File

@ -0,0 +1,21 @@
{{/*
Copyright 2017 The Openstack-Helm Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.service_ingress .Values.network.faultmanagement.ingress.public }}
{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "faultmanagement" -}}
{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
{{- end }}

View File

@ -192,6 +192,7 @@ manifests:
secret_ingress_tls: false
secret_keystone: true
service_fm: true
service_ingress: true
endpoints:
cluster_domain_suffix: cluster.local
oslo_db: