Parametrize and increase default of swift-proxy node_timeout

[apex-tripleo-heat-templates.git] / docker / compute-post.yaml

diff --git a/docker/compute-post.yaml b/docker/compute-post.yaml
index 4532549..3c4a941 100644 (file)
--- a/docker/compute-post.yaml
+++ b/docker/compute-post.yaml
@@ -28,7 +28,7 @@ parameters:
     default: "/etc/libvirt/libvirtd.conf"
   NovaConfig:
     type: string
-    default: "/etc/nova/nova.conf"
+    default: "/etc/nova/nova.conf,/etc/nova/rootwrap.conf"
   NeutronOpenvswitchAgentConfig:
     type: string
     default: "/etc/neutron/neutron.conf,/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini"
@@ -173,7 +173,7 @@ resources:
   NovaComputeContainersConfigOVS:
     type: OS::Heat::StructuredConfig
     properties:
-      group: docker-compose
+      group: docker-cmd
       config:
         ovsvswitchd:
           image:
@@ -200,6 +200,7 @@ resources:
           volumes:
            - /run:/run
            - /var/lib/etc-data/json-config/ovsdb-server.json:/var/lib/kolla/config_files/config.json
+           - /etc/openvswitchd:/etc/openvswitchd
           environment:
            - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
 
@@ -235,7 +236,7 @@ resources:
   LibvirtContainersConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: docker-compose
+      group: docker-cmd
       config:
         computedata:
           image:
@@ -259,6 +260,8 @@ resources:
           volumes:
            - /run:/run
            - /lib/modules:/lib/modules:ro
+           - /dev:/dev
+           - /lib/udev:/lib/udev
            - /sys/fs/cgroup:/sys/fs/cgroup
            - /var/lib/etc-data/json-config/nova-libvirt.json:/var/lib/kolla/config_files/config.json
            - /var/lib/etc-data/libvirt/libvirtd.conf:/var/lib/kolla/config_files/libvirtd.conf
@@ -278,7 +281,7 @@ resources:
   NovaComputeContainersConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: docker-compose
+      group: docker-cmd
       config:
         neutronovsagent:
           image:
@@ -316,8 +319,12 @@ resources:
           volumes:
            - /run:/run
            - /lib/modules:/lib/modules:ro
+           - /dev:/dev
+           - /lib/udev:/lib/udev
+           - /etc/iscsi:/etc/iscsi
            - /var/lib/etc-data/json-config/nova-compute.json:/var/lib/kolla/config_files/config.json
            - /var/lib/etc-data/nova/nova.conf:/var/lib/kolla/config_files/nova.conf:ro
+           - /var/lib/etc-data/nova/rootwrap.conf:/var/lib/kolla/config_files/rootwrap.conf:ro
           environment:
            - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           volumes_from: