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
This commit is contained in:
@@ -74,6 +74,11 @@ outputs:
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/ceilometer_agent_central.json:
|
||||
command: /usr/bin/ceilometer-polling --polling-namespaces central
|
||||
config_files:
|
||||
- source: "/var/lib/kolla/config_files/src/*"
|
||||
dest: "/"
|
||||
merge: true
|
||||
preserve_properties: true
|
||||
docker_config:
|
||||
step_3:
|
||||
ceilometer_init_log:
|
||||
@@ -97,7 +102,7 @@ outputs:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/kolla/config_files/ceilometer_agent_central.json:/var/lib/kolla/config_files/config.json:ro
|
||||
- /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
|
||||
- /var/lib/config-data/puppet-generated/ceilometer/:/var/lib/kolla/config_files/src:ro
|
||||
environment:
|
||||
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||
step_5:
|
||||
|
||||
Reference in New Issue
Block a user