aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-09-29 08:38:40 +0000
committerSam Yaple <sam@yaple.net>2015-09-29 08:39:43 +0000
commit5223965b6193757a5d63c7f5ccd466ce7953f6d7 (patch)
treed06016d4fd1843522e0f9f382bb636673a9d17b5 /docker
parent8bbc45c3993a7d026b7544a978432b809ac83921 (diff)
downloadkolla-5223965b6193757a5d63c7f5ccd466ce7953f6d7.tar.gz
kolla-5223965b6193757a5d63c7f5ccd466ce7953f6d7.zip
Fix ceph after config-external removal
Change-Id: I46dc2f02dda8219878eee3755b0891f4c3450682 Partially-Implements: blueprint replace-config-external
Diffstat (limited to 'docker')
-rw-r--r--docker/base/set_configs.py8
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):