Fix distro installs on Ubuntu

Beginning in the Stein release, Ubuntu distro packages are now using
Python3. This requires additionally installing and using the uwsgi
python3 plugin.

Install the 'python3-glance' package instead of 'glance-api'. glance-api
provides a service config file that conflicts with the one OSA provides.

Change-Id: I24e7a05372b6b1831529c620d3346889d5505f09

templates/glance-uwsgi.ini.j2

@@ -5,6 +5,9 @@ gid = {{ glance_system_group_name }}
 {% if glance_install_method == 'source' %}
 virtualenv = /openstack/venvs/glance-{{ glance_venv_tag }}
 {% endif %}
+{% if glance_install_method == 'distro' and (ansible_os_family | lower) == 'debian' %}
+plugin = python3
+{% endif %}
 wsgi-file = {{ glance_bin }}/{{ item.wsgi_name }}
 http-socket = {{ item.uwsgi_bind_address }}:{{ item.uwsgi_port }}
 

vars/debian.yml

@@ -28,10 +28,9 @@ glance_devel_distro_packages:
   - libxml2-dev
 
 glance_service_distro_packages:
-  - glance
-  - glance-api
+  - python3-glance
   - uwsgi
-  - uwsgi-plugin-python
+  - uwsgi-plugin-python3
 
 glance_oslomsg_amqp1_distro_packages:
   - libsasl2-modules