From 7856f0ab35e5ff439102bb8a8effa1f92664c9c9 Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Tue, 15 Jan 2019 03:48:03 -0500
Subject: [PATCH] Stein: Update neutron's daemonset-ovs-agent.yaml

neutron-sanity-check command triggers privsep code and produces the
following:

WARNING oslo.privsep.daemon [-] privsep log:
oslo_log.log.LogConfigError: Error loading logging config
/etc/neutron/logging.conf: [Errno 2] No such file or directory:
'/etc/neutron/logging.conf'

This will add log_config_append to neutron-etc and allow ovs-agent to
successfully deploy

Change-Id: I82dd56dc686e2efbd10921b248497955c37279f1
Story: 2004751
Task: 28894
Signed-off-by: Robert Church <robert.church@windriver.com>
---
 .../openstack-helm/centos/build_srpm.data     |  2 +-
 .../openstack-helm/centos/openstack-helm.spec |  2 +
 ...add-log_config_append-to-neutron-etc.patch | 38 +++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 openstack/openstack-helm/files/0008-Stein-add-log_config_append-to-neutron-etc.patch

diff --git a/openstack/openstack-helm/centos/build_srpm.data b/openstack/openstack-helm/centos/build_srpm.data
index 02fffd4f..14cc7512 100644
--- a/openstack/openstack-helm/centos/build_srpm.data
+++ b/openstack/openstack-helm/centos/build_srpm.data
@@ -5,4 +5,4 @@ TAR="$TAR_NAME-$SHA.tar.gz"
 
 COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* "
 
-TIS_PATCH_VER=8
+TIS_PATCH_VER=9
diff --git a/openstack/openstack-helm/centos/openstack-helm.spec b/openstack/openstack-helm/centos/openstack-helm.spec
index 888eb852..3b44bdac 100644
--- a/openstack/openstack-helm/centos/openstack-helm.spec
+++ b/openstack/openstack-helm/centos/openstack-helm.spec
@@ -25,6 +25,7 @@ Patch04: Remove-stale-Apache2-service-pids-when-a-POD-starts.patch
 Patch05: 0005-Add-heat-purge-deleted-cron-job.patch
 Patch06: 0006-Stein-Remove-ceilometer-upgrade-option.patch
 Patch07: 0007-Stein-Update-Cinder-to-include-resource_filters.json.patch
+Patch08: 0008-Stein-add-log_config_append-to-neutron-etc.patch
 
 BuildRequires: helm
 BuildRequires: openstack-helm-infra
@@ -42,6 +43,7 @@ Openstack Helm charts
 %patch05 -p1
 %patch06 -p1
 %patch07 -p1
+%patch08 -p1
 
 %build
 # initialize helm and build the toolkit
diff --git a/openstack/openstack-helm/files/0008-Stein-add-log_config_append-to-neutron-etc.patch b/openstack/openstack-helm/files/0008-Stein-add-log_config_append-to-neutron-etc.patch
new file mode 100644
index 00000000..63fa617a
--- /dev/null
+++ b/openstack/openstack-helm/files/0008-Stein-add-log_config_append-to-neutron-etc.patch
@@ -0,0 +1,38 @@
+From 6f72ebe170db5364287f3634359739d3f0c1c987 Mon Sep 17 00:00:00 2001
+From: Robert Church <robert.church@windriver.com>
+Date: Tue, 15 Jan 2019 03:39:27 -0500
+Subject: [PATCH 8/8] Stein: add log_config_append to neutron-etc
+
+neutron-sanity-check command triggers privsep code and produces the
+following:
+
+WARNING oslo.privsep.daemon [-] privsep log:
+oslo_log.log.LogConfigError: Error loading logging config
+/etc/neutron/logging.conf: [Errno 2] No such file or directory:
+'/etc/neutron/logging.conf'
+
+This will allow ovs-agent to successfully deploy
+
+Signed-off-by: Robert Church <robert.church@windriver.com>
+---
+ neutron/templates/daemonset-ovs-agent.yaml | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml
+index 34aba253..af765bd7 100644
+--- a/neutron/templates/daemonset-ovs-agent.yaml
++++ b/neutron/templates/daemonset-ovs-agent.yaml
+@@ -94,6 +94,10 @@ spec:
+               mountPath: /etc/neutron/neutron.conf
+               subPath: neutron.conf
+               readOnly: true
++            - name: neutron-etc
++              mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
++              subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
++              readOnly: true
+             - name: neutron-etc
+               mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
+               subPath: ml2_conf.ini
+-- 
+2.16.5
+