openstack/openstack-helm
Code Issues Proposed changes

Merge "Fix py3 issue on fernet-manage and update-endpoint"

Browse Source
This commit is contained in:
Zuul 2019-03-15 11:09:08 +00:00 committed by Gerrit Code Review
commit f191c62d13
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keystone/templates/bin/_endpoint-update.py.tpl
View File

@ -17,7 +17,10 @@ limitations under the License.
#!/usr/bin/env python #!/usr/bin/env python
import os import os
import sys import sys
try:
import ConfigParser import ConfigParser
except ImportError:
import configparser as ConfigParser
import logging import logging
from sqlalchemy import create_engine from sqlalchemy import create_engine

2
keystone/templates/bin/_fernet-manage.py.tpl
View File

@ -91,7 +91,7 @@ def read_from_files():
for key in keys: for key in keys:
with open(FERNET_DIR + key, 'r') as f: with open(FERNET_DIR + key, 'r') as f:
data[key] = f.read() data[key] = f.read()
if len(keys): if len(list(keys)):
LOG.debug("Keys read from files: %s", keys) LOG.debug("Keys read from files: %s", keys)
else: else:
LOG.warn("No keys were read from files.") LOG.warn("No keys were read from files.")