openstack/openstack-helm
Code Issues Proposed changes

Fix py3 issue on fernet-manage and update-endpoint

Browse Source 
fernet-manage:
 - filter used to return a list on python2 but on python3 it returns
 an iterator which has no len method
 - Coherce the keys var into a list so we can run len on it on both
 versions

update-endpoint:
 - ConfigParser is called configparser on python3
 - try/catch and import the proper configparser

Change-Id: I8296074f4d20e47afe0c7aea41bf21999685aecd
This commit is contained in:
Itxaka 2019-03-07 15:32:28 +01:00 committed by Itxaka Serrano Garcia
parent 00fff1d274
commit e136b0d822
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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
import ConfigParser try:
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.")