From 32c72a08eab38a82cc0cb8c46dae3eae520f30ba Mon Sep 17 00:00:00 2001
From: "KHIYANI, RAHUL (rk0850)" <rk0850@att.com>
Date: Fri, 23 Oct 2020 10:11:54 -0500
Subject: [PATCH] Update neutron to use Nginx apparmor profile

neutron-rpc-server container was removed and nginx container
was added here in this commit https://review.opendev.org/#/c/758919/4

Change-Id: Ie7b3a23ea8d7a5d3b1788bce1c1419fe1f627b75
---
 neutron/Chart.yaml                       | 2 +-
 neutron/templates/deployment-server.yaml | 2 +-
 neutron/values_overrides/apparmor.yaml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index 209a3ced21..cff1c3cdb2 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.1.2
+version: 0.1.3
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml
index 92e14cf803..1eedc226d4 100644
--- a/neutron/templates/deployment-server.yaml
+++ b/neutron/templates/deployment-server.yaml
@@ -73,7 +73,7 @@ spec:
 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
-{{ dict "envAll" $envAll "podName" "neutron-server" "containerNames" (list "neutron-server" "init" "neutron-rpc-server") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
+{{ dict "envAll" $envAll "podName" "neutron-server" "containerNames" (list "neutron-server" "init" "nginx") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
 {{ dict "envAll" $envAll "application" "neutron_server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
diff --git a/neutron/values_overrides/apparmor.yaml b/neutron/values_overrides/apparmor.yaml
index d069dd9fb8..7799a5d7f9 100644
--- a/neutron/values_overrides/apparmor.yaml
+++ b/neutron/values_overrides/apparmor.yaml
@@ -31,7 +31,7 @@ pod:
     neutron-server:
       neutron-server: runtime/default
       init: runtime/default
-      neutron-rpc-server: runtime/default
+      nginx: runtime/default
     neutron-test:
       init: runtime/default
       neutron-test: runtime/default