openstack
/
charm-swift-proxy
Code Issues Proposed changes

Use python3-jinja2 for py3. 

Change-Id: Ic00d65bee184b20fe98de7ce237df5fcba961622
This commit is contained in:
Felipe Reyes 2022-04-21 17:35:46 -04:00
parent 5f38205d3f
commit 5a4e378361
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hooks/swift_hooks.py
View File

@ -141,7 +141,12 @@ from charmhelpers.contrib.openstack.cert_utils import (
extra_pkgs = [
"haproxy",
"python-jinja2"
]
extra_pkgs_py2 = [
"python-jinja2",
]
extra_pkgs_py3 = [
"python3-jinja2",
]
hooks = Hooks()
@ -164,6 +169,10 @@ def install():
pkgs = determine_packages(rel)
apt_install(pkgs, fatal=True)
apt_install(extra_pkgs, fatal=True)
if (sys.version_info > (3, 0)):
apt_install(extra_pkgs_py3, fatal=True)
else:
apt_install(extra_pkgs_py2, fatal=True)
ensure_swift_dir()
# configure a directory on webserver for distributing rings.
ensure_www_dir_permissions(get_www_dir())