From 4d70846a7231c1991eb9efc910a815468d218d87 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Mon, 18 May 2020 13:28:34 +0000
Subject: [PATCH] Revert "Add shared volume for side-car wrapper locks"

This reverts commit 1517df0fc30b7b10263aa96fe48978d7bf17a0fe.

We reverted the sidecar wrappers, we don't need this anymore.

Change-Id: Ia69b7e489db9b26db852083bf5991b64df5b80a5
---
 deployment/neutron/neutron-dhcp-container-puppet.yaml | 7 -------
 deployment/neutron/neutron-l3-container-puppet.yaml   | 7 -------
 deployment/ovn/ovn-metadata-container-puppet.yaml     | 7 -------
 3 files changed, 21 deletions(-)

diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml
index fea08a672a..d4506884f8 100644
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@@ -363,7 +363,6 @@ outputs:
                   - /var/lib/neutron:/var/lib/neutron:shared,z
                   - /run/netns:/run/netns:shared
                   - /var/lib/neutron/kill_scripts:/etc/neutron/kill_scripts:shared,z
-                  - /var/lock/containers:/var/lock:shared,z
                 -
                   if:
                     - docker_enabled
@@ -411,12 +410,6 @@ outputs:
                 path: /var/lib/neutron
                 state: directory
                 setype: container_file_t
-          - - name: create /var/lock/containers
-              file:
-                path: /var/lock/containers
-                state: directory
-                mode: '0750'
-                setype: container_file_t
           - - name: enable virt_sandbox_use_netlink for healtcheck
               seboolean:
                 name: virt_sandbox_use_netlink
diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml
index 23568228f2..9dc31bcbf7 100644
--- a/deployment/neutron/neutron-l3-container-puppet.yaml
+++ b/deployment/neutron/neutron-l3-container-puppet.yaml
@@ -306,7 +306,6 @@ outputs:
                   - /var/lib/neutron:/var/lib/neutron:shared,z
                   - /run/netns:/run/netns:shared
                   - /var/lib/neutron/kill_scripts:/etc/neutron/kill_scripts:shared,z
-                  - /var/lock/containers:/var/lock:shared,z
                 -
                   if:
                     - docker_enabled
@@ -352,12 +351,6 @@ outputs:
                 path: /var/lib/neutron
                 state: directory
                 setype: container_file_t
-          - - name: create /var/lock/containers
-              file:
-                path: /var/lock/containers
-                state: directory
-                mode: '0750'
-                setype: container_file_t
           - - name: enable virt_sandbox_use_netlink for healtcheck
               seboolean:
                 name: virt_sandbox_use_netlink
diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml
index bc72f24778..fe3db5fb28 100644
--- a/deployment/ovn/ovn-metadata-container-puppet.yaml
+++ b/deployment/ovn/ovn-metadata-container-puppet.yaml
@@ -319,7 +319,6 @@ outputs:
                   - /var/lib/neutron:/var/lib/neutron:shared,z
                   - /run/netns:/run/netns:shared
                   - /var/lib/neutron/kill_scripts:/etc/neutron/kill_scripts:shared,z
-                  - /var/lock/containers:/var/lock:shared,z
                 -
                   if:
                     - docker_enabled
@@ -363,10 +362,4 @@ outputs:
                 path: /var/lib/neutron
                 state: directory
                 setype: container_file_t
-          - - name: create /var/lock/containers
-              file:
-                path: /var/lock/containers
-                state: directory
-                mode: '0750'
-                setype: container_file_t
       upgrade_tasks: []