Cleanup debian cinder service distro package list

The debian packages for individual cinder services provide service
configs which automatically start after install, leading to all cinder
services running on each cinder volume host. Instead only install the
python3-cinder library package and rely on the service files OSA manages.

uwsgi packages are only required on hosts running cinder-api, so an
additional variable, 'cinder_api_distro_packages' has been added for
packages specific to those hosts.

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

Change-Id: Iafcd9a8141fffb2226ec5103960064decc579bd5

templates/cinder-uwsgi.ini.j2

@@ -5,6 +5,9 @@ gid = {{ cinder_system_group_name }}
 {% if cinder_install_method == 'source' %}
 virtualenv = /openstack/venvs/cinder-{{ cinder_venv_tag }}
 {% endif %}
+{% if cinder_install_method == 'distro' and (ansible_os_family | lower) == 'debian' %}
+plugin = python3
+{% endif %}
 wsgi-file = {{ cinder_bin }}/{{ item.wsgi_name }}
 http = {{ item.uwsgi_bind_address }}:{{ item.uwsgi_port }}
 

vars/debian.yml

@@ -30,16 +30,11 @@ cinder_distro_packages:
   - zlibc
 
 cinder_service_distro_packages:
-  - cinder-api
-  - cinder-backup
-  - cinder-scheduler
-  - cinder-volume
+  - python3-cinder
   - python-openstackclient
   - python-shade
   - python-systemd
   - python3-systemd
-  - uwsgi
-  - uwsgi-plugin-python
 
 cinder_devel_distro_packages:
   - git-core
@@ -50,6 +45,10 @@ cinder_devel_distro_packages:
   - libxslt1-dev
   - libsystemd-dev
 
+cinder_api_distro_packages:
+  - uwsgi
+  - uwsgi-plugin-python3
+
 cinder_volume_distro_packages: []
 
 cinder_volume_distro_packages_tools:

vars/distro_install.yml

@@ -20,6 +20,9 @@
 #
 cinder_package_list: |-
   {% set packages = cinder_service_distro_packages %}
+  {% if cinder_services['cinder-api']['group'] in group_names %}
+  {%   set _ = packages.extend(cinder_api_distro_packages) %}
+  {% endif %}
   {% if cinder_services['cinder-volume']['group'] in group_names %}
   {%   set _ = packages.extend(cinder_volume_distro_packages) %}
   {%   if cinder_backend_lvm_inuse | bool %}

vars/redhat.yml

@@ -28,8 +28,6 @@ cinder_service_distro_packages:
   - python-openstackclient
   - python2-shade
   - systemd-python
-  - uwsgi
-  - uwsgi-plugin-python
 
 cinder_devel_distro_packages:
   - git
@@ -39,6 +37,10 @@ cinder_devel_distro_packages:
   - systemd-devel
   - zlib-devel
 
+cinder_api_distro_packages:
+  - uwsgi
+  - uwsgi-plugin-python
+
 cinder_volume_distro_packages: []
 
 cinder_volume_distro_packages_tools:

vars/suse.yml

@@ -34,6 +34,8 @@ cinder_service_distro_packages:
   - python-cursive
   - python-shade
   - python-systemd
+
+cinder_api_distro_packages:
   - uwsgi
   - uwsgi-python