Merge "Fix Mesos-managed volumes"

services/neutron/neutron-linuxbridge-agent.yml.j2

@@ -3,7 +3,6 @@ enabled: {{ enable_neutron | bool and neutron_plugin_agent == 'linuxbridge' }}
 container:
   image: "{{ neutron_linuxbridge_agent_image }}:{{ neutron_linuxbridge_agent_tag }}"
   privileged: true
-service:
   volumes:
     - containerPath: "/run"
       hostPath: "/run"
@@ -11,6 +10,7 @@ service:
     - containerPath: "/lib/modules"
       hostPath: "/lib/modules"
       mode: RO
+service:
   daemon:
     dependencies: [neutron_ansible_tasks/create_user, rabbitmq/daemon]
     command: neutron-linuxbridge-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini

services/neutron/neutron-openvswitch-agent.yml.j2

@@ -3,7 +3,6 @@ enabled: {{ enable_neutron | bool and neutron_plugin_agent == 'openvswitch' }}
 container:
   image: "{{ neutron_openvswitch_agent_image }}:{{ neutron_openvswitch_agent_tag }}"
   privileged: true
-service:
   volumes:
     - containerPath: "/run"
       hostPath: "/run"
@@ -11,6 +10,7 @@ service:
     - containerPath: "/lib/modules"
       hostPath: "/lib/modules"
       mode: RO
+service:
   daemon:
     dependencies: [openvswitch-tasks/setup_ovs_bridge]
     command: neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini

services/neutron/openvswitch-db.yml.j2

@@ -5,11 +5,11 @@ container:
   parameters:
     - key: volume
       value: "openvswitch_db:/var/lib/openvswitch/"
-service:
   volumes:
     - containerPath: "/run"
       hostPath: "/run"
       mode: RW
+service:
   daemon:
     dependencies: [neutron-server/db_sync, neutron_ansible_tasks/create_user, rabbitmq/daemon]
     command: /usr/sbin/ovsdb-server /etc/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --remote=punix:/run/openvswitch/db.sock --log-file=/var/log/openvswitch/ovsdb-server.log

services/neutron/openvswitch-vswitchd.yml.j2

@@ -3,7 +3,6 @@ enabled: {{ enable_neutron | bool and neutron_plugin_agent == 'openvswitch' }}
 container:
   image: "{{ openvswitch_vswitchd_image }}:{{ openvswitch_vswitchd_tag }}"
   privileged: true
-service:
   volumes:
     - containerPath: "/run"
       hostPath: "/run"
@@ -11,6 +10,7 @@ service:
     - containerPath: "/lib/modules"
       hostPath: "/lib/modules"
       mode: RO
+service:
   daemon:
     dependencies: [openvswitch-tasks/setup_ovs_bridge]
     command: /usr/sbin/ovs-vswitchd unix:/run/openvswitch/db.sock --mlockall

services/nova/nova-compute.yml.j2

@@ -3,10 +3,6 @@ enabled: {{ enable_nova | bool }}
 container:
   image: "{{ nova_compute_image }}:{{ nova_compute_tag }}"
   privileged: true
-service:
-  mem: {{ nova_compute_mem }}
-  taskRateLimit: 600.0
-  cpus: {{ nova_compute_cpus }}
   volumes:
     - containerPath: "/lib/modules"
       hostPath: "/lib/modules"
@@ -20,7 +16,10 @@ service:
     - containerPath: "/run"
       hostPath: "/run"
       mode: RW
-
+service:
+  mem: {{ nova_compute_mem }}
+  taskRateLimit: 600.0
+  cpus: {{ nova_compute_cpus }}
   daemon:
     dependencies: [nova-conductor/db_sync, nova_ansible_tasks/create_user,
                    keystone_ansible_tasks/running]

services/nova/nova-libvirt.yml.j2

@@ -3,10 +3,6 @@ enabled: {{ enable_nova | bool }}
 container:
   image: "{{ nova_libvirt_image }}:{{ nova_libvirt_tag }}"
   privileged: true
-service:
-  mem: {{ nova_libvirt_mem }}
-  taskRateLimit: 600.0
-  cpus: {{ nova_libvirt_cpus }}
   volumes:
     - containerPath: "/lib/modules"
       hostPath: "/lib/modules"
@@ -20,7 +16,10 @@ service:
     - containerPath: "/run"
       hostPath: "/run"
       mode: RW
-
+service:
+  mem: {{ nova_libvirt_mem }}
+  taskRateLimit: 600.0
+  cpus: {{ nova_libvirt_cpus }}
   daemon:
     dependencies: [nova-conductor/db_sync]
     command: libvirtd --listen