Merge "Revert "Add shared volume for side-car wrapper locks""

openstack-archive · May 20, 2020 · 9e751c8 · 9e751c8
2 parents f15f392 + 4d70846
commit 9e751c8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 21 deletions.
diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@@ -387,7 +387,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
@@ -435,12 +434,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
@@ -344,7 +344,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
@@ -390,12 +389,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
@@ -337,7 +337,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
@@ -381,10 +380,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: []