From 9cf4f288fde3218b6d6b36ebccffcf5eb51349bb Mon Sep 17 00:00:00 2001
From: Chi Lo <cl566n@att.com>
Date: Sat, 23 Feb 2019 03:39:00 -0800
Subject: [PATCH] Adding Ranger Audit Services to Ingress

Change-Id: I684c35209427143c750918f4fc683b85c0d4a967
---
 ranger/templates/ingress-ranger.yaml        |  5 +++++
 ranger/templates/secret-ingress-tls.yaml    |  1 +
 ranger/templates/service-ingress-audit.yaml | 20 ++++++++++++++++++++
 ranger/values.yaml                          |  7 +++++++
 4 files changed, 33 insertions(+)
 create mode 100755 ranger/templates/service-ingress-audit.yaml

diff --git a/ranger/templates/ingress-ranger.yaml b/ranger/templates/ingress-ranger.yaml
index 60246a21..d936bf90 100755
--- a/ranger/templates/ingress-ranger.yaml
+++ b/ranger/templates/ingress-ranger.yaml
@@ -39,3 +39,8 @@ limitations under the License.
 {{ $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" }}
+{{- end }}
+
diff --git a/ranger/templates/secret-ingress-tls.yaml b/ranger/templates/secret-ingress-tls.yaml
index 6eb01f26..3d0bf694 100755
--- a/ranger/templates/secret-ingress-tls.yaml
+++ b/ranger/templates/secret-ingress-tls.yaml
@@ -20,4 +20,5 @@ limitations under the License.
 {{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "ims" "backendServiceType" "ims" ) }}
 {{- 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" ) }}
 {{- end }}
diff --git a/ranger/templates/service-ingress-audit.yaml b/ranger/templates/service-ingress-audit.yaml
new file mode 100755
index 00000000..13271186
--- /dev/null
+++ b/ranger/templates/service-ingress-audit.yaml
@@ -0,0 +1,20 @@
+{{/*
+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_audit .Values.network.audit.ingress.public }}
+{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "audit" -}}
+{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
+{{- end }}
diff --git a/ranger/values.yaml b/ranger/values.yaml
index 86895f81..e18764f1 100755
--- a/ranger/values.yaml
+++ b/ranger/values.yaml
@@ -167,6 +167,9 @@ secrets:
     rms:
       rms:
         public: rms
+    audit:
+      audit:
+        public: audit
 
 # typically overriden by environmental
 # values, but should include all endpoints
@@ -189,6 +192,7 @@ endpoints:
     name: audit
     hosts:
       default: audit-api
+      public: audit
     host_fqdn_override:
       default: null
     path:
@@ -198,6 +202,7 @@ endpoints:
     port:
       api:
         default: 7008
+        public: 80
   cms:
     name: cms
     hosts:
@@ -446,6 +451,7 @@ manifests:
   ingress_ims: true
   ingress_rds: true
   ingress_rms: true
+  ingress_audit: true
   secret_db: true
   secret_ingress_tls: true
   secret_ssh_key: true
@@ -460,6 +466,7 @@ manifests:
   service_ingress_ims: true
   service_ingress_rds: true
   service_ingress_rms: true
+  service_ingress_audit: true
   service_audit: true
   service_cms: true
   service_fms: true