diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-04 14:28:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-04 14:28:39 +0000 |
| commit | 7f9ba5a4771945a9a1c75443dbd34c1eb948a928 (patch) | |
| tree | 36cc49a88ec83af18dd5fc5b4d4c344544ba9337 /docker/base | |
| parent | b4fbb0201a8b5acccfe8b55175cc3acb70e42b27 (diff) | |
| parent | e878da0412993330d54e91c56739b6386f367eef (diff) | |
| download | kolla-7f9ba5a4771945a9a1c75443dbd34c1eb948a928.tar.gz kolla-7f9ba5a4771945a9a1c75443dbd34c1eb948a928.zip | |
Merge "Reconfigure cinder service"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/set_configs.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/docker/base/set_configs.py b/docker/base/set_configs.py index 16e3c35eb..83b635c30 100644 --- a/docker/base/set_configs.py +++ b/docker/base/set_configs.py @@ -282,9 +282,15 @@ def execute_config_check(): dest = config_file.get('dest') perm = config_file.get('perm') owner = config_file.get('owner') + optional = config_file.get('optional', False) if not os.path.exists(dest): - LOG.error('Dest file not exist: %s', dest) - sys.exit(1) + if optional: + LOG.info('Dest file does not exist, but is optional: %s', + dest) + return + else: + LOG.error('Dest file does not exist and is: %s', dest) + sys.exit(1) # check content with open(source) as fp1, open(dest) as fp2: if fp1.read() != fp2.read(): |