drop binary install type from templates and config

As we have only source image type then we do not need to handle other
option.

Change-Id: I753aa0182cfc975bb8b5cd1476ab2c336a7691fa

ansible/roles/aodh/templates/wsgi-aodh.conf.j2

@@ -1,5 +1,5 @@
 {% set aodh_log_dir = '/var/log/kolla/aodh' %}
-{% set binary_path = '/usr/bin' if aodh_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
+{% set binary_path = '/var/lib/kolla/venv/bin' %}
 Listen {{ api_interface_address | put_address_in_context('url') }}:{{ aodh_api_listen_port }}
 
 ServerSignature Off

ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2

@@ -1,5 +1,5 @@
 {% set cloudkitty_log_dir = '/var/log/kolla/cloudkitty' %}
-{% set binary_path = '/usr/bin' if cloudkitty_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
+{% set binary_path = '/var/lib/kolla/venv/bin' %}
 Listen {{ api_interface_address | put_address_in_context('url') }}:{{ cloudkitty_api_port }}
 
 ServerSignature Off

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/python' ~ distro_python_version ~ '/site-packages' if freezer_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages' %}
+{% set python_path = '/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

ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2

@@ -1,5 +1,5 @@
 {% set gnocchi_log_dir = '/var/log/kolla/gnocchi' %}
-{% set wsgi_path = '/usr/bin' if gnocchi_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
+{% set wsgi_path = '/var/lib/kolla/venv/bin' %}
 Listen {{ api_interface_address | put_address_in_context('url') }}:{{ gnocchi_api_listen_port }}
 
 ServerSignature Off

ansible/roles/heat/templates/wsgi-heat-api-cfn.conf.j2

@@ -1,5 +1,5 @@
 {% set heat_log_dir = '/var/log/kolla/heat' %}
-{% set binary_path = '/usr/bin' if heat_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
+{% set binary_path = '/var/lib/kolla/venv/bin' %}
 {% if heat_enable_tls_backend | bool %}
 {% if kolla_base_distro in ['centos']  %}
 LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so

ansible/roles/heat/templates/wsgi-heat-api.conf.j2

@@ -1,5 +1,5 @@
 {% set heat_log_dir = '/var/log/kolla/heat' %}
-{% set binary_path = '/usr/bin' if heat_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
+{% set binary_path = '/var/lib/kolla/venv/bin' %}
 {% if heat_enable_tls_backend | bool %}
 {% if kolla_base_distro in ['centos']  %}
 LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so

ansible/roles/horizon/templates/horizon.conf.j2

@@ -1,4 +1,4 @@
-{% set python_path = '/usr/share/openstack-dashboard' if horizon_install_type == 'binary' else '/var/lib/kolla/venv/lib/python' + distro_python_version + '/site-packages' %}
+{% set python_path = '/var/lib/kolla/venv/lib/python' + distro_python_version + '/site-packages' %}
 
 {% if horizon_enable_tls_backend | bool %}
 {% if kolla_base_distro in ['centos']  %}
@@ -22,11 +22,7 @@ TraceEnable off
     WSGIScriptReloading On
     WSGIDaemonProcess horizon-http processes={{ horizon_wsgi_processes }} threads={{ horizon_wsgi_threads }} user=horizon group=horizon display-name=horizon
     WSGIProcessGroup horizon-http
-{% if kolla_base_distro in ['debian'] and horizon_install_type == 'binary' %}
-    WSGIScriptAlias / {{ python_path }}/wsgi.py
-{% else %}
     WSGIScriptAlias / {{ python_path }}/openstack_dashboard/wsgi.py
-{% endif %}
     WSGIPassAuthorization On
     WSGIApplicationGroup %{GLOBAL}
 
@@ -34,11 +30,7 @@ TraceEnable off
         Require all granted
     </Location>
 
-{% if kolla_base_distro in ['debian', 'ubuntu'] and horizon_install_type == 'binary' %}
-    Alias /static /var/lib/openstack-dashboard/static
-{% else %}
     Alias /static {{ python_path }}/static
-{% endif %}
     <Location "/static">
         SetHandler None
     </Location>

ansible/roles/horizon/templates/local_settings.j2

@@ -864,9 +864,6 @@ KEY_MANAGER = {
         'project_domain_name': '{{ default_project_domain_name }}'
 }
 {% endif %}
-{% if kolla_base_distro in ['debian', 'ubuntu'] and horizon_install_type == 'binary' %}
-STATIC_ROOT = "/var/lib/openstack-dashboard/static/"
-{% endif %}
 
 # Allow operators to overwrite variables (LP: #1769970).
 from .custom_local_settings import *

ansible/roles/ironic/templates/ironic-api-wsgi.conf.j2

@@ -1,5 +1,5 @@
 {% set ironic_log_dir = '/var/log/kolla/ironic' %}
-{% set wsgi_directory = '/usr/bin' if ironic_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
+{% set wsgi_directory = '/var/lib/kolla/venv/bin' %}
 {% if ironic_enable_tls_backend | bool %}
 {% if kolla_base_distro in ['centos']  %}
 LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so

ansible/roles/keystone/templates/wsgi-keystone.conf.j2

@@ -1,5 +1,5 @@
 {% set keystone_log_dir = '/var/log/kolla/keystone' %}
-{% set binary_path = '/usr/bin' if keystone_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
+{% set binary_path = '/var/lib/kolla/venv/bin' %}
 {% if keystone_enable_tls_backend | bool %}
 {% if kolla_base_distro in ['centos']  %}
 LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so

ansible/roles/masakari/templates/wsgi-masakari.conf.j2

@@ -1,5 +1,5 @@
 {% set masakari_log_dir = '/var/log/kolla/masakari' %}
-{% set binary_path = '/usr/bin' if masakari_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
+{% set binary_path = '/var/lib/kolla/venv/bin' %}
 
 Listen {{ api_interface_address | put_address_in_context('url') }}:{{ masakari_api_port }}
 

ansible/roles/monasca/templates/monasca-api/wsgi-api.conf.j2

@@ -1,5 +1,5 @@
 {% set monasca_log_dir = '/var/log/kolla/monasca' %}
-{% set wsgi_path = '/usr/bin' if monasca_install_type == 'binary' else '/monasca-api/monasca_api/api' %}
+{% set wsgi_path = '/monasca-api/monasca_api/api' %}
 
 Listen {{ api_interface_address | put_address_in_context('url') }}:{{ monasca_api_port }}
 

ansible/roles/nova/templates/nova-api-wsgi.conf.j2

@@ -1,5 +1,5 @@
 {% set nova_log_dir = '/var/log/kolla/nova' %}
-{% set wsgi_directory = '/usr/bin' if nova_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
+{% set wsgi_directory = '/var/lib/kolla/venv/bin' %}
 {% if nova_enable_tls_backend | bool %}
 {% if kolla_base_distro in ['centos']  %}
 LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so

ansible/roles/octavia/templates/octavia-wsgi.conf.j2

@@ -1,4 +1,4 @@
-{% set wsgi_directory = '/usr/bin' if octavia_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
+{% set wsgi_directory = '/var/lib/kolla/venv/bin' %}
 {% if octavia_enable_tls_backend | bool %}
 {% if kolla_base_distro in ['centos']  %}
 LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so

ansible/roles/placement/templates/placement-api-wsgi.conf.j2

@@ -1,5 +1,5 @@
 {% set log_dir = '/var/log/kolla/placement' %}
-{% set wsgi_directory = '/usr/bin' if placement_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
+{% set wsgi_directory = '/var/lib/kolla/venv/bin' %}
 {% if placement_enable_tls_backend | bool %}
 {% if kolla_base_distro in ['centos']  %}
 LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so

etc/kolla/globals.yml

@@ -30,7 +30,7 @@
 # Valid options are ['centos', 'debian', 'rhel', 'ubuntu']
 #kolla_base_distro: "centos"
 
-# Valid options are [ binary, source ]
+# Valid options are [ source ]
 #kolla_install_type: "source"
 
 # Do not override this unless you know what you are doing.