diff options
| author | Zuul <zuul@review.opendev.org> | 2020-08-28 19:03:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-08-28 19:03:42 +0000 |
| commit | 5dcd1dd915189e047e1e3b481c1b0d2dba9ea2fe (patch) | |
| tree | 4ce3ab6983eb101fba5fc4eb9dfdfbf959d5846e /docker | |
| parent | 2cfc25e53a8bb6cb21bee24051c65d36015c6c09 (diff) | |
| parent | c5320eb22386c34d83435fa0b9aa03b178996b52 (diff) | |
| download | kolla-5dcd1dd915189e047e1e3b481c1b0d2dba9ea2fe.tar.gz kolla-5dcd1dd915189e047e1e3b481c1b0d2dba9ea2fe.zip | |
Merge "Fix kolla_set_configs --check with a directory"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/set_configs.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/docker/base/set_configs.py b/docker/base/set_configs.py index 5f030866f..572e4a001 100644 --- a/docker/base/set_configs.py +++ b/docker/base/set_configs.py @@ -204,8 +204,8 @@ class ConfigFile(object): return False for file_ in files: full_path = os.path.join(root, file_) - dest_full_path = os.path.join(dest, os.path.relpath(source, - full_path)) + dest_full_path = os.path.join(dest, os.path.relpath(full_path, + source)) if not self._cmp_file(full_path, dest_full_path): return False return True @@ -225,8 +225,9 @@ class ConfigFile(object): # otherwise means copy the source to dest if dest.endswith(os.sep): dest = os.path.join(dest, os.path.basename(source)) - if os.path.isdir(source) and not self._cmp_dir(source, dest): - bad_state_files.append(source) + if os.path.isdir(source): + if not self._cmp_dir(source, dest): + bad_state_files.append(source) elif not self._cmp_file(source, dest): bad_state_files.append(source) if len(bad_state_files) != 0: @@ -404,7 +405,7 @@ def execute_config_strategy(config): def execute_config_check(config): - for data in config['config_files']: + for data in config.get('config_files', []): config_file = ConfigFile(**data) config_file.check() |