From 99b47be838df0a267df474e9aa708ea5051cf9d8 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Sat, 12 May 2018 17:34:28 -0500
Subject: [PATCH] Heat: Correct ingress manifest conditionals

This PS corrects the ingress manifest conditionals to use the right
key for enable/disable control.

Change-Id: I2d4766aaeb01375eab5cd44af4bfbb89754f8bf3
---
 heat/templates/ingress-cfn.yaml        | 2 +-
 heat/templates/ingress-cloudwatch.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/heat/templates/ingress-cfn.yaml b/heat/templates/ingress-cfn.yaml
index f0cf40ba9d..cf963fb655 100644
--- a/heat/templates/ingress-cfn.yaml
+++ b/heat/templates/ingress-cfn.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.ingress_api .Values.network.cfn.ingress.public }}
+{{- if and .Values.manifests.ingress_cfn .Values.network.cfn.ingress.public }}
 {{- $ingressOpts := dict "envAll" . "backendService" "cfn" "backendServiceType" "cloudformation" "backendPort" "h-cfn" -}}
 {{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
 {{- end }}
diff --git a/heat/templates/ingress-cloudwatch.yaml b/heat/templates/ingress-cloudwatch.yaml
index e4296a5f66..17bc10422c 100644
--- a/heat/templates/ingress-cloudwatch.yaml
+++ b/heat/templates/ingress-cloudwatch.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.ingress_api .Values.network.cloudwatch.ingress.public }}
+{{- if and .Values.manifests.ingress_cloudwatch .Values.network.cloudwatch.ingress.public }}
 {{- $ingressOpts := dict "envAll" . "backendService" "cloudwatch" "backendServiceType" "cloudwatch" "backendPort" "h-cwh" -}}
 {{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
 {{- end }}