openstack/kolla-ansible
Code Issues Proposed changes

Fix stale namespace removal issue

Browse Source 
When using both /run and /run/netns in docker container, mount
propagation won't work when delete namespace after the containers are
restarted. This PS makes /run mount as shared.

Closes-Bug: #1616268
Change-Id: Ie16699e1b193b2bf1263d89ea634e89ea69add9e
This commit is contained in:
Jeffrey Zhang 2016-10-15 01:49:13 +08:00
parent 4bda9aa844
commit ce5a11a374
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/ceilometer/tasks/start.yml
View File

@ -60,7 +60,7 @@
volumes: volumes:
- "{{ node_config_directory }}/ceilometer-compute/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ceilometer-compute/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/run/:/run/" - "/run/:/run/:shared"
- "ceilometer:/var/lib/ceilometer/" - "ceilometer:/var/lib/ceilometer/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "nova_libvirt:/var/lib/libvirt" - "nova_libvirt:/var/lib/libvirt"

4
ansible/roles/cinder/tasks/start.yml
View File

@ -29,7 +29,7 @@
- "{{ node_config_directory }}/cinder-volume/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/cinder-volume/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "/run/:/run/" - "/run/:/run/:shared"
- "{% if enable_iscsid | bool %}cinder:/var/lib/cinder{% endif %}" - "{% if enable_iscsid | bool %}cinder:/var/lib/cinder{% endif %}"
- "{% if enable_iscsid | bool %}iscsi_info:/etc/iscsi{% endif %}" - "{% if enable_iscsid | bool %}iscsi_info:/etc/iscsi{% endif %}"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
@ -51,7 +51,7 @@
- "{{ node_config_directory }}/cinder-backup/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/cinder-backup/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "/run/:/run/" - "/run/:/run/:shared"
- "{% if enable_cinder_backend_lvm | bool %}cinder:/var/lib/cinder{% endif %}" - "{% if enable_cinder_backend_lvm | bool %}cinder:/var/lib/cinder{% endif %}"
- "{% if enable_cinder_backend_lvm | bool %}iscsi_info:/etc/iscsi{% endif %}" - "{% if enable_cinder_backend_lvm | bool %}iscsi_info:/etc/iscsi{% endif %}"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"

2
ansible/roles/common/tasks/start.yml
View File

@ -29,7 +29,7 @@
- "{{ node_config_directory }}/kolla-toolbox/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/kolla-toolbox/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "/run/:/run/" - "/run/:/run/:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- name: Initializing toolbox container using normal user - name: Initializing toolbox container using normal user

2
ansible/roles/ironic/tasks/start.yml
View File

@ -35,7 +35,7 @@
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/sys:/sys" - "/sys:/sys"
- "/dev:/dev" - "/dev:/dev"
- "/run:/run" - "/run:/run:shared"
- "kolla_logs:/var/log/kolla" - "kolla_logs:/var/log/kolla"
- "ironic:/var/lib/ironic" - "ironic:/var/lib/ironic"
- "ironic_pxe:/tftpboot/" - "ironic_pxe:/tftpboot/"

4
ansible/roles/iscsi/tasks/start.yml
View File

@ -12,7 +12,7 @@
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "/run/:/run/" - "/run/:/run/:shared"
- "/sys/fs/cgroup:/sys/fs/cgroup:ro" - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/sys/kernel/config:/configfs" - "/sys/kernel/config:/configfs"
@ -34,7 +34,7 @@
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "/run/:/run/" - "/run/:/run/:shared"
- "/sys/fs/cgroup:/sys/fs/cgroup:ro" - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/sys/kernel/config:/configfs" - "/sys/kernel/config:/configfs"

2
ansible/roles/kuryr/tasks/bootstrap.yml
View File

@ -15,5 +15,5 @@
volumes: volumes:
- "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/run:/run" - "/run:/run:shared"
- "/usr/lib/docker:/usr/lib/docker" - "/usr/lib/docker:/usr/lib/docker"

2
ansible/roles/kuryr/tasks/start.yml
View File

@ -14,6 +14,6 @@
volumes: volumes:
- "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/run:/run" - "/run:/run:shared"
- "/usr/lib/docker:/usr/lib/docker" - "/usr/lib/docker:/usr/lib/docker"
when: inventory_hostname in groups['compute'] when: inventory_hostname in groups['compute']

2
ansible/roles/manila/tasks/start.yml
View File

@ -33,6 +33,6 @@
volumes: volumes:
- "{{ node_config_directory }}/manila-share/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/manila-share/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/run/:/run/" - "/run/:/run/:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: inventory_hostname in groups['manila-share'] when: inventory_hostname in groups['manila-share']

2
ansible/roles/multipathd/tasks/start.yml
View File

@ -12,7 +12,7 @@
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "/run/:/run/" - "/run/:/run/:shared"
- "/sys/fs/cgroup:/sys/fs/cgroup:ro" - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/sys/kernel/config:/configfs" - "/sys/kernel/config:/configfs"

22
ansible/roles/neutron/tasks/start.yml
View File

@ -8,7 +8,7 @@
volumes: volumes:
- "{{ node_config_directory }}/openvswitch-db-server/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/openvswitch-db-server/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/run:/run" - "/run:/run:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "openvswitch_db:/var/lib/openvswitch/" - "openvswitch_db:/var/lib/openvswitch/"
when: when:
@ -63,7 +63,7 @@
- "{{ node_config_directory }}/openvswitch-vswitchd/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/openvswitch-vswitchd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/run:/run" - "/run:/run:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
@ -97,7 +97,7 @@
- "{{ node_config_directory }}/neutron-openvswitch-agent/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-openvswitch-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/run:/run" - "/run:/run:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: when:
- ( - (
@ -129,7 +129,7 @@
- "{{ node_config_directory }}/neutron-sfc-agent/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-sfc-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/run:/run" - "/run:/run:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: when:
- ( - (
@ -159,7 +159,7 @@
- "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/run:/run" - "/run:/run:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
with_sequence: start=1 end={{ num_nova_fake_per_node }} with_sequence: start=1 end={{ num_nova_fake_per_node }}
when: when:
@ -178,7 +178,7 @@
- "{{ node_config_directory }}/neutron-sfc-agent-fake-{{ item }}/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-sfc-agent-fake-{{ item }}/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/run:/run" - "/run:/run:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
with_sequence: start=1 end={{ num_nova_fake_per_node }} with_sequence: start=1 end={{ num_nova_fake_per_node }}
when: when:
@ -201,7 +201,7 @@
- "{{ node_config_directory }}/neutron-linuxbridge-agent/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-linuxbridge-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/run:/run" - "/run:/run:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
@ -222,7 +222,7 @@
volumes: volumes:
- "{{ node_config_directory }}/neutron-dhcp-agent/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-dhcp-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/run/:/run/" - "/run/:/run/:shared"
- "/run/netns/:/run/netns/:shared" - "/run/netns/:/run/netns/:shared"
- "neutron_metadata_socket:/var/lib/neutron/kolla/" - "neutron_metadata_socket:/var/lib/neutron/kolla/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
@ -239,7 +239,7 @@
volumes: volumes:
- "{{ node_config_directory }}/neutron-l3-agent/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-l3-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/run:/run" - "/run:/run:shared"
- "/run/netns/:/run/netns/:shared" - "/run/netns/:/run/netns/:shared"
- "neutron_metadata_socket:/var/lib/neutron/kolla/" - "neutron_metadata_socket:/var/lib/neutron/kolla/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
@ -258,7 +258,7 @@
volumes: volumes:
- "{{ node_config_directory }}/neutron-lbaas-agent/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-lbaas-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/run:/run" - "/run:/run:shared"
- "/run/netns/:/run/netns/:shared" - "/run/netns/:/run/netns/:shared"
- "neutron_metadata_socket:/var/lib/neutron/kolla/" - "neutron_metadata_socket:/var/lib/neutron/kolla/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
@ -293,7 +293,7 @@
volumes: volumes:
- "{{ node_config_directory }}/neutron-vpnaas-agent/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-vpnaas-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/run:/run" - "/run:/run:shared"
- "/run/netns/:/run/netns/:shared" - "/run/netns/:/run/netns/:shared"
- "neutron_metadata_socket:/var/lib/neutron/kolla/" - "neutron_metadata_socket:/var/lib/neutron/kolla/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"

6
ansible/roles/nova/tasks/start_compute.yml
View File

@ -11,7 +11,7 @@
- "{{ node_config_directory }}/nova-libvirt/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/nova-libvirt/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/run/:/run/" - "/run/:/run/:shared"
- "/dev:/dev" - "/dev:/dev"
- "/sys/fs/cgroup:/sys/fs/cgroup" - "/sys/fs/cgroup:/sys/fs/cgroup"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
@ -31,7 +31,7 @@
- "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/run:/run" - "/run:/run:shared"
- "/dev:/dev" - "/dev:/dev"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "{% if enable_iscsid | bool %}iscsi_info:/etc/iscsi{% endif %}" - "{% if enable_iscsid | bool %}iscsi_info:/etc/iscsi{% endif %}"
@ -76,7 +76,7 @@
- "{{ node_config_directory }}/nova-compute-fake-{{ item }}/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/nova-compute-fake-{{ item }}/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "/run:/run" - "/run:/run:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
with_sequence: start=1 end={{ num_nova_fake_per_node }} with_sequence: start=1 end={{ num_nova_fake_per_node }}
when: when: