aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/nova-ironic.yaml
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-06-21 16:02:55 +0200
committerMartin André <m.andre@redhat.com>2017-07-10 11:13:25 +0200
commitcf18e865d14adc319b6c2dfafd650f32dad4d853 (patch)
tree86231cde72c4adb55d4e06e1a8f17836dea834de /docker/services/nova-ironic.yaml
parent766de0cacb18171264d2a699ac48cacb8d35a152 (diff)
Copy only generated puppet files into the container
This solves a problem with bind-mounts when the containers are holding files descriptors open. At the same time this makes the template more robust to puppet changes since new config files will be available in the containers without needing to update the templates. Partial-Bug: #1698323 Change-Id: Ia4ad6d77387e3dc354cd131c2f9756939fb8f736
Diffstat (limited to 'docker/services/nova-ironic.yaml')
-rw-r--r--docker/services/nova-ironic.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 8f98839..294293f 100644
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -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
@@ -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