Merge "Add DeployedServerEnvironmentOutput"

[apex-tripleo-heat-templates.git] / docker / services / nova-ironic.yaml

diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index be0dd11..294293f 100644 (file)
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -8,12 +8,12 @@ parameters:
     description: namespace
     default: 'tripleoupstream'
     type: string
-  DockerNovaComputeImage:
+  DockerNovaComputeIronicImage:
     description: image
     default: 'centos-binary-nova-compute-ironic:latest'
     type: string
   DockerNovaConfigImage:
-    description: image
+    description: The container image to use for the nova config_volume
     default: 'centos-binary-nova-base:latest'
     type: string
   ServiceNetMap:
@@ -72,6 +72,11 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/nova_ironic.json:
           command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/nova
               owner: nova:nova
@@ -81,11 +86,11 @@ outputs:
               recurse: true
       docker_config:
         step_5:
-          novacompute:
+          nova_compute:
             image:
               list_join:
               - '/'
-              - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
+              - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeIronicImage} ]
             net: host
             privileged: true
             user: root
@@ -95,7 +100,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
+                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
                   - /run:/run
                   - /dev:/dev
                   - /etc/iscsi:/etc/iscsi