diff --git a/ansible/roles/aodh/templates/wsgi-aodh.conf.j2 b/ansible/roles/aodh/templates/wsgi-aodh.conf.j2 index c9af178cf742b3b6b0c09940f03adb5464160c98..152f97d38ba97d17e01b18e79fe81347f7242d84 100644 --- a/ansible/roles/aodh/templates/wsgi-aodh.conf.j2 +++ b/ansible/roles/aodh/templates/wsgi-aodh.conf.j2 @@ -1,6 +1,6 @@ {% set aodh_log_dir = '/var/log/kolla/aodh' %} {% if aodh_install_type == 'binary' %} - {% set python_path = '/usr/lib/python3/dist-packages' if kolla_base_distro in ['debian', 'ubuntu'] else '/usr/lib/python2.7/site-packages' %} + {% set python_path = '/usr/lib/python3/dist-packages' if kolla_base_distro in ['debian', 'ubuntu'] else '/usr/lib/python' ~ distro_python_version ~ '/site-packages' %} {% else %} {% set python_path = '/var/lib/kolla/venv/lib/python' + distro_python_version + '/site-packages' %} {% endif %} diff --git a/ansible/roles/cinder/templates/cinder-wsgi.conf.j2 b/ansible/roles/cinder/templates/cinder-wsgi.conf.j2 index 616af7beecccd59f72e442e19ec213f04dbe4092..cc426028abd9ccd949c8381059aee35140022851 100644 --- a/ansible/roles/cinder/templates/cinder-wsgi.conf.j2 +++ b/ansible/roles/cinder/templates/cinder-wsgi.conf.j2 @@ -1,5 +1,5 @@ {% if cinder_install_type == 'binary' %} - {% set python_path = '/usr/lib/python3/dist-packages' if kolla_base_distro in ['debian', 'ubuntu'] else '/usr/lib/python2.7/site-packages' %} + {% set python_path = '/usr/lib/python3/dist-packages' if kolla_base_distro in ['debian', 'ubuntu'] else '/usr/lib/python' ~ distro_python_version ~ '/site-packages' %} {% else %} {% set python_path = '/var/lib/kolla/venv/lib/python' + distro_python_version + '/site-packages' %} {% endif %} diff --git a/ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2 b/ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2 index 8c52f6c9cd95a1d7561c230114974121097c81cc..0c9e4fd8b4c1c63b19640e9c8d84c0d507e9c3c5 100644 --- a/ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2 +++ b/ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2 @@ -1,5 +1,5 @@ {% set cloudkitty_log_dir = '/var/log/kolla/cloudkitty' %} -{% set python_path = '/usr/lib/python2.7/site-packages' if cloudkitty_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %} +{% set python_path = '/usr/lib/python' ~ distro_python_version ~ '/site-packages' if cloudkitty_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages' %} {% set binary_path = '/usr/bin' if cloudkitty_install_type == 'binary' else '/var/lib/kolla/venv/bin' %} Listen {{ api_interface_address | put_address_in_context('url') }}:{{ cloudkitty_api_port }} diff --git a/ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2 b/ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2 index 746ef853e7d87cbf2bc4ccb67df7a5dfad7d0444..c5e147071a6f1e71077159ee74382bc5e4ab2c1c 100644 --- a/ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2 +++ b/ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2 @@ -1,5 +1,5 @@ {% set freezer_log_dir = '/var/log/kolla/freezer' %} -{% set python_path = '/usr/lib/python2.7/site-packages' if freezer_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %} +{% set python_path = '/usr/lib/python' ~ distro_python_version ~ '/site-packages' if freezer_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages' %} Listen {{ api_interface_address | put_address_in_context('url') }}:{{ freezer_api_port }} ServerSignature Off diff --git a/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2 b/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2 index b545bf6bca61dfc01edd5394edea7058c9c75466..421bb7f0e48b7244ff7d5167d1e034d9960b9861 100644 --- a/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2 +++ b/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2 @@ -1,6 +1,6 @@ {% set gnocchi_log_dir = '/var/log/kolla/gnocchi' %} {% if gnocchi_install_type == 'binary' %} - {% set python_path = '/usr/lib/python3/dist-packages' if kolla_base_distro in ['debian', 'ubuntu'] else '/usr/lib/python2.7/site-packages' %} + {% set python_path = '/usr/lib/python3/dist-packages' if kolla_base_distro in ['debian', 'ubuntu'] else '/usr/lib/python' ~ distro_python_version ~ '/site-packages' %} {% else %} {% set python_path = '/var/lib/kolla/venv/lib/python' + distro_python_version + '/site-packages' %} {% endif %} diff --git a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 index c6308344413af9898f20b0dda0519e89b9d3c43e..97c12ada51d7adaa9f1764bb274c4f06f30660c4 100644 --- a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 +++ b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 @@ -1,6 +1,6 @@ {% set keystone_log_dir = '/var/log/kolla/keystone' %} {% if keystone_install_type == 'binary' %} -{% set python_path = '/usr/lib/python3/dist-packages' if kolla_base_distro in ['debian', 'ubuntu'] else '/usr/lib/python2.7/site-packages' %} +{% set python_path = '/usr/lib/python3/dist-packages' if kolla_base_distro in ['debian', 'ubuntu'] else '/usr/lib/python' ~ distro_python_version ~ '/site-packages' %} {% else %} {% set python_path = '/var/lib/kolla/venv/lib/python' + distro_python_version + '/site-packages' %} {% endif %} diff --git a/ansible/roles/masakari/templates/wsgi-masakari.conf.j2 b/ansible/roles/masakari/templates/wsgi-masakari.conf.j2 index 780b6569728b3a02d3d3c1582cfee2e02531b9f5..1c20de3c95aeb65d02cf66d0f16bad7fe215ee34 100644 --- a/ansible/roles/masakari/templates/wsgi-masakari.conf.j2 +++ b/ansible/roles/masakari/templates/wsgi-masakari.conf.j2 @@ -2,7 +2,7 @@ {% if kolla_base_distro in ['debian', 'ubuntu'] %} {% set python_path = '/usr/lib/python3/dist-packages' if masakari_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' + distro_python_version + '/site-packages' %} {% else %} - {% set python_path = '/usr/lib/python2.7/site-packages' if masakari_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' + distro_python_version + '/site-packages' %} + {% set python_path = '/usr/lib/python' ~ distro_python_version ~ '/site-packages' if masakari_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' + distro_python_version + '/site-packages' %} {% endif %} {% set binary_path = '/usr/bin' if masakari_install_type == 'binary' else '/var/lib/kolla/venv/bin' %} diff --git a/ansible/roles/monasca/templates/monasca-api/wsgi-api.conf.j2 b/ansible/roles/monasca/templates/monasca-api/wsgi-api.conf.j2 index 12c71444d9c900503aed6db35a493cdb8dd7289f..d44dca67bd1106d455305fb0ddc0a0ee624374cb 100644 --- a/ansible/roles/monasca/templates/monasca-api/wsgi-api.conf.j2 +++ b/ansible/roles/monasca/templates/monasca-api/wsgi-api.conf.j2 @@ -1,5 +1,5 @@ {% set monasca_log_path = '/var/log/kolla/monasca' %} -{% set python_path = '/usr/lib/python2.7/site-packages' if monasca_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %} +{% set python_path = '/usr/lib/python' ~ distro_python_version ~ '/site-packages' if monasca_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages' %} {% set wsgi_path = '/usr/bin' if monasca_install_type == 'binary' else '/monasca-api/monasca_api/api' %} Listen {{ api_interface_address | put_address_in_context('url') }}:{{ monasca_api_port }} diff --git a/ansible/roles/monasca/templates/monasca-log-api/wsgi-log-api.conf.j2 b/ansible/roles/monasca/templates/monasca-log-api/wsgi-log-api.conf.j2 index d3182743bf34ffe0e25fc3a873af23168978b784..22c732e07c7268834baf1bdf896a418f7e37348c 100644 --- a/ansible/roles/monasca/templates/monasca-log-api/wsgi-log-api.conf.j2 +++ b/ansible/roles/monasca/templates/monasca-log-api/wsgi-log-api.conf.j2 @@ -1,5 +1,5 @@ {% set monasca_log_path = '/var/log/kolla/monasca' %} -{% set python_path = '/usr/lib/python2.7/site-packages' if monasca_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %} +{% set python_path = '/usr/lib/python' ~ distro_python_version ~ '/site-packages' if monasca_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages' %} {% set wsgi_path = '/usr/bin' if monasca_install_type == 'binary' else '/monasca-log/monasca_log_api/app' %} Listen {{ api_interface_address | put_address_in_context('url') }}:{{ monasca_log_api_port }} diff --git a/ansible/roles/panko/templates/wsgi-panko.conf.j2 b/ansible/roles/panko/templates/wsgi-panko.conf.j2 index 6b4a8a03534ad16688c1fde617bc2447410cf163..89d902721e5cad3f60c30acf2411fd33cc78097d 100644 --- a/ansible/roles/panko/templates/wsgi-panko.conf.j2 +++ b/ansible/roles/panko/templates/wsgi-panko.conf.j2 @@ -1,5 +1,5 @@ {% set panko_log_dir = '/var/log/kolla/panko' %} -{% set python_path = '/usr/lib/python2.7/site-packages' if panko_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %} +{% set python_path = '/usr/lib/python' ~ distro_python_version ~ '/site-packages' if panko_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages' %} {% set binary_path = '/usr/bin' if panko_install_type == 'binary' else '/var/lib/kolla/venv/bin' %} Listen {{ api_interface_address | put_address_in_context('url') }}:{{ panko_api_port }} diff --git a/ansible/roles/placement/templates/placement-api-wsgi.conf.j2 b/ansible/roles/placement/templates/placement-api-wsgi.conf.j2 index d26f481f883a6f8fbb1525ef54f554614e489542..ee8261f2776edfbadd45872824914374a682fd4b 100644 --- a/ansible/roles/placement/templates/placement-api-wsgi.conf.j2 +++ b/ansible/roles/placement/templates/placement-api-wsgi.conf.j2 @@ -1,6 +1,6 @@ {% set log_dir = '/var/log/kolla/placement' %} {% if placement_install_type == 'binary' %} - {% set python_path = '/usr/lib/python3/dist-packages' if kolla_base_distro in ['debian', 'ubuntu'] else '/usr/lib/python2.7/site-packages' %} + {% set python_path = '/usr/lib/python3/dist-packages' if kolla_base_distro in ['debian', 'ubuntu'] else '/usr/lib/python' ~ distro_python_version ~ '/site-packages' %} {% else %} {% set python_path = '/var/lib/kolla/venv/lib/python' + distro_python_version + '/site-packages' %} {% endif %} diff --git a/ansible/roles/qinling/templates/wsgi-qinling.conf.j2 b/ansible/roles/qinling/templates/wsgi-qinling.conf.j2 index 33613683aab758dd2e500c9363a343f6eedfc1ee..3f9df860dcd1d5134d00332cfe81478a9ebaa6a6 100644 --- a/ansible/roles/qinling/templates/wsgi-qinling.conf.j2 +++ b/ansible/roles/qinling/templates/wsgi-qinling.conf.j2 @@ -2,7 +2,7 @@ {% if kolla_base_distro == 'ubuntu' %} {% set python_path = '/usr/lib/python3/dist-packages' if qinling_install_type == 'binary' else '/var/lib/kolla/venv/lib/python3.6/site-packages' %} {% else %} - {% set python_path = '/usr/lib/python2.7/site-packages' if qinling_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %} + {% set python_path = '/usr/lib/python' ~ distro_python_version ~ '/site-packages' if qinling_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages' %} {% endif %} Listen {{ api_interface_address | put_address_in_context('url') }}:{{ qinling_api_port }} diff --git a/ansible/roles/vitrage/templates/wsgi-vitrage.conf.j2 b/ansible/roles/vitrage/templates/wsgi-vitrage.conf.j2 index 978bc69fe061bcf94925030bbd0a44e43c2cd273..f8184f1ccbb5048ba996799eb19cac6fa246289f 100644 --- a/ansible/roles/vitrage/templates/wsgi-vitrage.conf.j2 +++ b/ansible/roles/vitrage/templates/wsgi-vitrage.conf.j2 @@ -1,5 +1,5 @@ {% set vitrage_log_dir = '/var/log/kolla/vitrage' %} -{% set python_path = '/usr/lib/python2.7/site-packages' if vitrage_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %} +{% set python_path = '/usr/lib/python' ~ distro_python_version ~ '/site-packages' if vitrage_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages' %} Listen {{ 'api' | kolla_address | put_address_in_context('url') }}:{{ vitrage_api_port }} ServerSignature Off diff --git a/ansible/roles/zun/templates/wsgi-zun.conf.j2 b/ansible/roles/zun/templates/wsgi-zun.conf.j2 index 52a95852eed421084f02689d5fdf762559f3d06b..5fa866e1682e8ea106bc0d8d0d44764ffb8034fb 100644 --- a/ansible/roles/zun/templates/wsgi-zun.conf.j2 +++ b/ansible/roles/zun/templates/wsgi-zun.conf.j2 @@ -1,5 +1,5 @@ {% set zun_log_dir = '/var/log/kolla/zun' %} -{% set python_path = '/usr/lib/python2.7/site-packages' if zun_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %} +{% set python_path = '/usr/lib/python' ~ distro_python_version ~ '/site-packages' if zun_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages' %} Listen {{ api_interface_address | put_address_in_context('url') }}:{{ zun_api_port }} ServerSignature Off