From 13cb45020ba53102b7fe72626b6fb92470dba209 Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Mon, 9 Dec 2024 16:01:45 +0530
Subject: [PATCH] [DNM] no tls check memcached issue fixes

---
 .../neutronapi/httpd/10-neutron-httpd.conf    |  4 +--
 zuul.d/project.yaml                           | 32 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/templates/neutronapi/httpd/10-neutron-httpd.conf b/templates/neutronapi/httpd/10-neutron-httpd.conf
index c74511f6..fd73382c 100644
--- a/templates/neutronapi/httpd/10-neutron-httpd.conf
+++ b/templates/neutronapi/httpd/10-neutron-httpd.conf
@@ -13,9 +13,9 @@
   ## Request header rules
   ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
 {{- if $vhost.TLS }}
-  RequestHeader set X-Forwarded-Proto "https"
+  RequestHeader setIfEmpty X-Forwarded-Proto "https"
 {{- else }}
-  RequestHeader set X-Forwarded-Proto "http"
+  RequestHeader setIfEmpty X-Forwarded-Proto "http"
 {{- end }}
 
   ## Proxy rules
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index f8f860ad..c94de78f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -4,4 +4,34 @@
     github-check:
       jobs:
         - openstack-k8s-operators-content-provider
-        - neutron-operator-tempest-multinode
+        - neutron-operator-tempest-multinode:
+            vars:
+              cifmw_install_yamls_environment:
+                KUBECONFIG: /home/zuul/.crc/machines/crc/kubeconfig
+                BMO_SETUP: 'false'
+                CHECKOUT_FROM_OPENSTACK_REF: 'true'
+                OPENSTACK_K8S_BRANCH: main
+                OPENSTACK_REPO: "/home/zuul/src/github.com/openstack-k8s-operators/openstack-operator"
+                OUT: /home/zuul/ci-framework-data/artifacts/manifests
+                OUTPUT_DIR: /home/zuul/ci-framework-data/artifacts/edpm
+                DATAPLANE_TLS_ENABLED: false
+              cifmw_edpm_prepare_kustomizations:
+                - apiVersion: kustomize.config.k8s.io/v1beta1
+                  kind: Kustomization
+                  namespace: openstack
+                  patches:
+                  - patch: |-
+                      apiVersion: core.openstack.org/v1beta1
+                      kind: OpenStackControlPlane
+                      metadata:
+                        name: unused
+                      spec:
+                        tls:
+                          podLevel:
+                            enabled: false
+                        memcached:
+                          templates:
+                            memcached:
+                              replicas: 3
+                    target:
+                      kind: OpenStackControlPlane