Merge "Revert "Add shared volume for side-car wrapper locks""
This commit is contained in:
commit
9e751c820d
|
@ -387,7 +387,6 @@ outputs:
|
||||||
- /var/lib/neutron:/var/lib/neutron:shared,z
|
- /var/lib/neutron:/var/lib/neutron:shared,z
|
||||||
- /run/netns:/run/netns:shared
|
- /run/netns:/run/netns:shared
|
||||||
- /var/lib/neutron/kill_scripts:/etc/neutron/kill_scripts:shared,z
|
- /var/lib/neutron/kill_scripts:/etc/neutron/kill_scripts:shared,z
|
||||||
- /var/lock/containers:/var/lock:shared,z
|
|
||||||
-
|
-
|
||||||
if:
|
if:
|
||||||
- docker_enabled
|
- docker_enabled
|
||||||
|
@ -435,12 +434,6 @@ outputs:
|
||||||
path: /var/lib/neutron
|
path: /var/lib/neutron
|
||||||
state: directory
|
state: directory
|
||||||
setype: container_file_t
|
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
|
- - name: enable virt_sandbox_use_netlink for healtcheck
|
||||||
seboolean:
|
seboolean:
|
||||||
name: virt_sandbox_use_netlink
|
name: virt_sandbox_use_netlink
|
||||||
|
|
|
@ -344,7 +344,6 @@ outputs:
|
||||||
- /var/lib/neutron:/var/lib/neutron:shared,z
|
- /var/lib/neutron:/var/lib/neutron:shared,z
|
||||||
- /run/netns:/run/netns:shared
|
- /run/netns:/run/netns:shared
|
||||||
- /var/lib/neutron/kill_scripts:/etc/neutron/kill_scripts:shared,z
|
- /var/lib/neutron/kill_scripts:/etc/neutron/kill_scripts:shared,z
|
||||||
- /var/lock/containers:/var/lock:shared,z
|
|
||||||
-
|
-
|
||||||
if:
|
if:
|
||||||
- docker_enabled
|
- docker_enabled
|
||||||
|
@ -390,12 +389,6 @@ outputs:
|
||||||
path: /var/lib/neutron
|
path: /var/lib/neutron
|
||||||
state: directory
|
state: directory
|
||||||
setype: container_file_t
|
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
|
- - name: enable virt_sandbox_use_netlink for healtcheck
|
||||||
seboolean:
|
seboolean:
|
||||||
name: virt_sandbox_use_netlink
|
name: virt_sandbox_use_netlink
|
||||||
|
|
|
@ -337,7 +337,6 @@ outputs:
|
||||||
- /var/lib/neutron:/var/lib/neutron:shared,z
|
- /var/lib/neutron:/var/lib/neutron:shared,z
|
||||||
- /run/netns:/run/netns:shared
|
- /run/netns:/run/netns:shared
|
||||||
- /var/lib/neutron/kill_scripts:/etc/neutron/kill_scripts:shared,z
|
- /var/lib/neutron/kill_scripts:/etc/neutron/kill_scripts:shared,z
|
||||||
- /var/lock/containers:/var/lock:shared,z
|
|
||||||
-
|
-
|
||||||
if:
|
if:
|
||||||
- docker_enabled
|
- docker_enabled
|
||||||
|
@ -381,10 +380,4 @@ outputs:
|
||||||
path: /var/lib/neutron
|
path: /var/lib/neutron
|
||||||
state: directory
|
state: directory
|
||||||
setype: container_file_t
|
setype: container_file_t
|
||||||
- - name: create /var/lock/containers
|
|
||||||
file:
|
|
||||||
path: /var/lock/containers
|
|
||||||
state: directory
|
|
||||||
mode: '0750'
|
|
||||||
setype: container_file_t
|
|
||||||
upgrade_tasks: []
|
upgrade_tasks: []
|
||||||
|
|
Loading…
Reference in New Issue