scottk/openstack-helm
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/openstack-helm.git synced 2025-12-25 17:27:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Heat: Correct ingress manifest conditionals"

Browse Source
This commit is contained in:
Zuul
2018-05-13 01:24:05 +00:00
committed by Gerrit Code Review
parent d971db7df4 99b47be838
commit baac4d6ec8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
heat/templates/ingress-cfn.yaml
View File

@@ -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 }}

2
heat/templates/ingress-cloudwatch.yaml
View File

@@ -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 }}