Enable ranger-agent https flag and uuid access
Fix typo for ranger_agent_https_enable flag Include uuid service to public access Change-Id: Ie3eb07da61f97235d2cbea424401e057327480a5
This commit is contained in:
parent
fef8b29c70
commit
6a9037c10d
|
@ -104,7 +104,7 @@ spec:
|
|||
- name: REMOTE_REPO
|
||||
value: {{ .Values.conf.ranger.rds.repo_remote_location }}
|
||||
{{- end }}
|
||||
{{- if .Values.conf.ranger.DEFAULT.ranger_agent_https_enable }}
|
||||
{{- if .Values.conf.ranger.DEFAULT.ranger_agent_https_enabled }}
|
||||
- name: CERT_LOCATION
|
||||
value: {{ .Values.conf.ranger.DEFAULT.ranger_agent_client_cert_path }}
|
||||
- name: CERT_FILE
|
||||
|
|
|
@ -39,6 +39,11 @@ limitations under the License.
|
|||
{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
|
||||
{{- end }}
|
||||
|
||||
{{- if and .Values.manifests.ingress_uuid .Values.network.uuid.ingress.public }}
|
||||
{{- $ingressOpts := dict "envAll" . "backendService" "uuid" "backendServiceType" "uuid" "backendPort" "uuid" -}}
|
||||
{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
|
||||
{{- end }}
|
||||
|
||||
{{- if and .Values.manifests.ingress_audit .Values.network.audit.ingress.public }}
|
||||
{{- $ingressOpts := dict "envAll" . "backendService" "audit" "backendServiceType" "audit" "backendPort" "audit" -}}
|
||||
{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
|
||||
|
|
|
@ -21,4 +21,5 @@ limitations under the License.
|
|||
{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "rms" "backendServiceType" "rms" ) }}
|
||||
{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "rds" "backendServiceType" "rds" ) }}
|
||||
{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "audit" "backendServiceType" "audit" ) }}
|
||||
{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "uuid" "backendServiceType" "uuid" ) }}
|
||||
{{- end }}
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
{{/*
|
||||
Copyright 2020 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_uuid .Values.network.uuid.ingress.public }}
|
||||
{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "uuid" -}}
|
||||
{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
|
||||
{{- end }}
|
|
@ -190,6 +190,9 @@ secrets:
|
|||
audit:
|
||||
audit:
|
||||
public: audit
|
||||
uuid:
|
||||
uuid:
|
||||
public: uuid
|
||||
|
||||
# typically overriden by environmental
|
||||
# values, but should include all endpoints
|
||||
|
@ -366,6 +369,7 @@ endpoints:
|
|||
name: uuid
|
||||
hosts:
|
||||
default: uuid-api
|
||||
public: uuid
|
||||
host_fqdn_override:
|
||||
default: null
|
||||
path:
|
||||
|
@ -375,6 +379,7 @@ endpoints:
|
|||
port:
|
||||
api:
|
||||
default: 7001
|
||||
public: 80
|
||||
|
||||
network:
|
||||
audit:
|
||||
|
@ -472,6 +477,7 @@ manifests:
|
|||
ingress_rds: true
|
||||
ingress_rms: true
|
||||
ingress_audit: true
|
||||
ingress_uuid: true
|
||||
secret_db: true
|
||||
secret_ingress_tls: true
|
||||
secret_ssh_key: true
|
||||
|
@ -487,6 +493,7 @@ manifests:
|
|||
service_ingress_rds: true
|
||||
service_ingress_rms: true
|
||||
service_ingress_audit: true
|
||||
service_ingress_uuid: true
|
||||
service_audit: true
|
||||
service_cms: true
|
||||
service_fms: true
|
||||
|
@ -504,7 +511,7 @@ conf:
|
|||
pecan_debug: True
|
||||
ssl_verify: False
|
||||
use_handlers: console
|
||||
ranger_agent_https_enable: False
|
||||
ranger_agent_https_enabled: False
|
||||
ranger_agent_client_cert_path: ''
|
||||
audit:
|
||||
log: null
|
||||
|
|
Loading…
Reference in New Issue