diff options
Diffstat (limited to 'docker')
-rwxr-xr-x | docker/docker-puppet.py | 11 | ||||
-rw-r--r-- | docker/services/ironic-conductor.yaml | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py index eb647737..c364d039 100755 --- a/docker/docker-puppet.py +++ b/docker/docker-puppet.py @@ -259,4 +259,13 @@ for p in process_map: # Fire off processes to perform each configuration. Defaults # to the number of CPUs on the system. p = multiprocessing.Pool(process_count) -p.map(mp_puppet_config, process_map) +returncodes = list(p.map(mp_puppet_config, process_map)) +config_volumes = [pm[0] for pm in process_map] +success = True +for returncode, config_volume in zip(returncodes, config_volumes): + if returncode != 0: + print('ERROR configuring %s' % config_volume) + success = False + +if not success: + sys.exit(1) diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml index f07fb47c..3047f30b 100644 --- a/docker/services/ironic-conductor.yaml +++ b/docker/services/ironic-conductor.yaml @@ -72,10 +72,7 @@ outputs: /var/lib/kolla/config_files/ironic_conductor.json: command: /usr/bin/ironic-conductor permissions: - - path: /var/lib/ironic/httpboot - owner: ironic:ironic - recurse: true - - path: /var/lib/ironic/tftpboot + - path: /var/lib/ironic owner: ironic:ironic recurse: true docker_config: |