X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fcompute-post.yaml;h=60b831beda847ea595f41e3f3592c462904fe72b;hb=e95304e58ac5bee7cf6f71e4525fbea3f1839828;hp=4532549f4145bd1a3c1fd6403f772665a00801e2;hpb=19e44d2a61d31982b76e3ac9d0e8bb90f9ca57e1;p=apex-tripleo-heat-templates.git

diff --git a/docker/compute-post.yaml b/docker/compute-post.yaml
index 4532549f..60b831be 100644
--- a/docker/compute-post.yaml
+++ b/docker/compute-post.yaml
@@ -5,8 +5,8 @@ description: >
 parameters:
   servers:
     type: json
-  NodeConfigIdentifiers:
-     type: json
+  DeployIdentifier:
+     type: string
      description: Value which changes if the node configuration may need to be re-applied
   DockerNamespace:
     type: string
@@ -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"
@@ -38,6 +38,14 @@ parameters:
   NeutronOpenvswitchAgentOvsVolume:
     type: string
     default: " "
+  StepConfig:
+    type: string
+    description: Config manifests that will be used to step through the deployment.
+    default: ''
+  RoleData:
+    type: json
+    default: {}
+
 
 resources:
 
@@ -56,7 +64,11 @@ resources:
       outputs:
       - name: result
       config:
-        get_file: ../puppet/manifests/overcloud_compute.pp
+        list_join:
+        - ''
+        - - get_file: ../puppet/manifests/overcloud_compute.pp
+          - {get_param: StepConfig}
+
 
   ComputePuppetDeployment:
     type: OS::Heat::SoftwareDeployments
@@ -65,7 +77,7 @@ resources:
       servers:  {get_param: servers}
       config: {get_resource: ComputePuppetConfig}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
         tripleo::packages::enable_install: True
 
   CopyEtcConfig:
@@ -173,7 +185,7 @@ resources:
   NovaComputeContainersConfigOVS:
     type: OS::Heat::StructuredConfig
     properties:
-      group: docker-compose
+      group: docker-cmd
       config:
         ovsvswitchd:
           image:
@@ -200,6 +212,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 +248,7 @@ resources:
   LibvirtContainersConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: docker-compose
+      group: docker-cmd
       config:
         computedata:
           image:
@@ -259,6 +272,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 +293,7 @@ resources:
   NovaComputeContainersConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: docker-compose
+      group: docker-cmd
       config:
         neutronovsagent:
           image:
@@ -316,8 +331,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: