diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-18 02:06:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-18 02:06:19 +0000 |
| commit | 9c235f6b914d5cc76d1d796d32e9be5d22709c27 (patch) | |
| tree | 4d128b0fced234e13ab2ac6a247efbd4d63706d5 | |
| parent | 7adfd95184bdbb41fddcf588d00fa74604406d26 (diff) | |
| parent | b98bc3a458a0382cdd32d219a946a08ca2da023f (diff) | |
| download | kolla-9c235f6b914d5cc76d1d796d32e9be5d22709c27.tar.gz kolla-9c235f6b914d5cc76d1d796d32e9be5d22709c27.zip | |
Merge "Change libvirt volume name to libvirtd"
| -rw-r--r-- | ansible/roles/nova/tasks/start_compute.yml | 4 | ||||
| -rwxr-xr-x | tools/cleanup-containers | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ansible/roles/nova/tasks/start_compute.yml b/ansible/roles/nova/tasks/start_compute.yml index f3dce9008..f88e3aa91 100644 --- a/ansible/roles/nova/tasks/start_compute.yml +++ b/ansible/roles/nova/tasks/start_compute.yml @@ -12,8 +12,8 @@ - "/lib/modules:/lib/modules:ro" - "/run/:/run/" - "/sys/fs/cgroup:/sys/fs/cgroup" + - "libvirtd:/var/lib/libvirt" - "nova_compute:/var/lib/nova/" - - "nova_libvirt:/var/lib/libvirt" when: inventory_hostname in groups['compute'] - name: Starting nova-compute container @@ -28,8 +28,8 @@ - "/lib/modules:/lib/modules:ro" - "/run:/run" - "kolla_logs:/var/log/kolla/" + - "libvirtd:/var/lib/libvirt" - "nova_compute:/var/lib/nova/" - - "nova_libvirt:/var/lib/libvirt" when: - inventory_hostname in groups['compute'] - not enable_nova_fake | bool diff --git a/tools/cleanup-containers b/tools/cleanup-containers index da716b060..31a59275f 100755 --- a/tools/cleanup-containers +++ b/tools/cleanup-containers @@ -50,10 +50,11 @@ else heka{,_socket} \ ironic_pxe \ kolla_logs \ + libvirtd \ mariadb \ mongodb \ neutron_metadata_socket \ - nova_{compute,libvirt} \ + nova_compute \ openvswitch_db \ rabbitmq ) |