diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-29 10:20:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-29 10:20:05 +0000 |
| commit | 8f7006e32350bf290bc9188cd8cf3e4f9c34aea3 (patch) | |
| tree | 34068d2bd2f666f87ffac0d5f1ae93bed11e5e34 /docker | |
| parent | 713977166d4477107abce856adc089e2565e61a8 (diff) | |
| parent | 5223965b6193757a5d63c7f5ccd466ce7953f6d7 (diff) | |
| download | kolla-8f7006e32350bf290bc9188cd8cf3e4f9c34aea3.tar.gz kolla-8f7006e32350bf290bc9188cd8cf3e4f9c34aea3.zip | |
Merge "Fix ceph after config-external removal"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/set_configs.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/base/set_configs.py b/docker/base/set_configs.py index 19415c6fc..941e74ca2 100644 --- a/docker/base/set_configs.py +++ b/docker/base/set_configs.py @@ -86,11 +86,13 @@ def copy_files(data): else: # Source is a directory for src in os.listdir(source_path): - LOG.info('Copying {} to {}'.format(src, dest_path)) + LOG.info('Copying {} to {}'.format( + os.path.join(source_path, src), dest_path)) + if os.path.isdir(src): - shutil.copytree(src, dest_path) + shutil.copytree(os.path.join(source_path, src), dest_path) else: - shutil.copy(src, dest_path) + shutil.copy(os.path.join(source_path, src), dest_path) def set_permissions(data): |