Merge "Change the directory for httpd certs/keys to be service-specific"

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

diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml
index 678b8c2..3047f30 100644 (file)
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@@ -69,20 +69,12 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/ironic_conductor.json:
-           command: /usr/bin/ironic-conductor
-           config_files:
-           - dest: /etc/ironic/ironic.conf
-             owner: ironic
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
-           permissions:
-           - path: /var/lib/ironic/httpboot
-             owner: ironic:ironic
-             recurse: true
-           - path: /var/lib/ironic/tftpboot
-             owner: ironic:ironic
-             recurse: true
+        /var/lib/kolla/config_files/ironic_conductor.json:
+          command: /usr/bin/ironic-conductor
+          permissions:
+            - path: /var/lib/ironic
+              owner: ironic:ironic
+              recurse: true
       docker_config:
         step_4:
           ironic_conductor:
@@ -96,7 +88,7 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/ironic_conductor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /lib/modules:/lib/modules:ro