Use python3-jinja2 for py3.
Change-Id: Ic00d65bee184b20fe98de7ce237df5fcba961622
This commit is contained in:
parent
5f38205d3f
commit
5a4e378361
|
@ -141,7 +141,12 @@ from charmhelpers.contrib.openstack.cert_utils import (
|
||||||
|
|
||||||
extra_pkgs = [
|
extra_pkgs = [
|
||||||
"haproxy",
|
"haproxy",
|
||||||
"python-jinja2"
|
]
|
||||||
|
extra_pkgs_py2 = [
|
||||||
|
"python-jinja2",
|
||||||
|
]
|
||||||
|
extra_pkgs_py3 = [
|
||||||
|
"python3-jinja2",
|
||||||
]
|
]
|
||||||
|
|
||||||
hooks = Hooks()
|
hooks = Hooks()
|
||||||
|
@ -164,6 +169,10 @@ def install():
|
||||||
pkgs = determine_packages(rel)
|
pkgs = determine_packages(rel)
|
||||||
apt_install(pkgs, fatal=True)
|
apt_install(pkgs, fatal=True)
|
||||||
apt_install(extra_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()
|
ensure_swift_dir()
|
||||||
# configure a directory on webserver for distributing rings.
|
# configure a directory on webserver for distributing rings.
|
||||||
ensure_www_dir_permissions(get_www_dir())
|
ensure_www_dir_permissions(get_www_dir())
|
||||||
|
|
Loading…
Reference in New Issue