Merge "Customize "supported_pci_vendor_devs" for SR-IOV"

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

diff --git a/docker/compute-post.yaml b/docker/compute-post.yaml
index a2c7d78..60b831b 100644 (file)
--- 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
@@ -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:
@@ -236,7 +248,7 @@ resources:
   LibvirtContainersConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: docker-compose
+      group: docker-cmd
       config:
         computedata:
           image:
@@ -281,7 +293,7 @@ resources:
   NovaComputeContainersConfig:
     type: OS::Heat::StructuredConfig
     properties:
-      group: docker-compose
+      group: docker-cmd
       config:
         neutronovsagent:
           image: