Fix network policy job

This patch set addresses an issue with the placement component of nova
breaking the network policy job.

Also, make the network policy jobs voting to ensure things do not break.

Change-Id: I41dfa6a335a915dbaf08114c2e14e906c76e85ba
Signed-off-by: Tin Lam <tin@irrational.io>

nova/templates/netpol-nova.yaml

@@ -0,0 +1,20 @@
+{{/*
+Copyright 2017-2018 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 .Values.manifests.network_policy -}}
+{{- $netpol_opts := dict "envAll" . "name" "application" "label" "nova" }}
+{{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }}
+{{- end -}}

nova/templates/netpol-placement.yaml

@@ -15,10 +15,6 @@ limitations under the License.
 */}}
 
 {{- if .Values.manifests.network_policy -}}
-{{- $netpol_opts := dict "envAll" . "name" "application" "label" "nova" }}
-{{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }}
-{{- if .Values.manifests.deployment_placement -}}
 {{- $netpol_opts := dict "envAll" . "name" "application" "label" "placement" }}
 {{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }}
 {{- end -}}
-{{- end -}}

zuul.d/project.yaml

@@ -46,10 +46,8 @@
         - openstack-helm-horizon
         - openstack-helm-apparmor:
             voting: false
-        - openstack-helm-netpol-compute-kit:
-            voting: false
-        - openstack-helm-netpol-cinder:
-            voting: false
+        - openstack-helm-netpol-compute-kit
+        - openstack-helm-netpol-cinder
     gate:
       jobs:
         - openstack-helm-lint